Browse Source

随访任务加一个删除,随访完成列表加搜索

liyuanyuan 4 years ago
parent
commit
68c52494de

+ 48 - 9
codegit/CallCenterApi/CallCenterApi.DAL/SF_Task.cs

27
         {
27
         {
28
             StringBuilder strSql = new StringBuilder();
28
             StringBuilder strSql = new StringBuilder();
29
             strSql.Append("insert into SF_Task(");
29
             strSql.Append("insert into SF_Task(");
30
-            strSql.Append("taskName,createTime,createBy)");
30
+            strSql.Append("taskName,createTime,createBy, deleteTime  ,deleteBy      ,isDelete )");
31
             strSql.Append(" values (");
31
             strSql.Append(" values (");
32
-            strSql.Append("@taskName,@createTime,@createBy)");
32
+            strSql.Append("@taskName,@createTime,@createBy, @deleteTime  ,@deleteBy      ,@isDelete )");
33
             strSql.Append(";select @@IDENTITY");
33
             strSql.Append(";select @@IDENTITY");
34
             SqlParameter[] parameters = {
34
             SqlParameter[] parameters = {
35
                     new SqlParameter("@taskName", SqlDbType.NVarChar,200),
35
                     new SqlParameter("@taskName", SqlDbType.NVarChar,200),
36
                     new SqlParameter("@createTime", SqlDbType.DateTime),
36
                     new SqlParameter("@createTime", SqlDbType.DateTime),
37
-                    new SqlParameter("@createBy", SqlDbType.Int,4)};
37
+                    new SqlParameter("@createBy", SqlDbType.Int,4),
38
+             new SqlParameter("@deleteTime", SqlDbType.DateTime),
39
+                    new SqlParameter("@deleteBy", SqlDbType.Int,4),
40
+                      new SqlParameter("@isDelete", SqlDbType.Int,4)
41
+
42
+
43
+            };
38
             parameters[0].Value = model.taskName;
44
             parameters[0].Value = model.taskName;
39
             parameters[1].Value = model.createTime;
45
             parameters[1].Value = model.createTime;
40
             parameters[2].Value = model.createBy;
46
             parameters[2].Value = model.createBy;
47
+            parameters[3].Value = model.deleteTime;
48
+            parameters[4].Value = model.deleteBy;
49
+
50
+            parameters[5].Value = model.isDelete;
41
 
51
 
42
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
52
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
43
             if (obj == null)
53
             if (obj == null)
58
             strSql.Append("update SF_Task set ");
68
             strSql.Append("update SF_Task set ");
59
             strSql.Append("taskName=@taskName,");
69
             strSql.Append("taskName=@taskName,");
60
             strSql.Append("createTime=@createTime,");
70
             strSql.Append("createTime=@createTime,");
61
-            strSql.Append("createBy=@createBy");
71
+            strSql.Append("createBy=@createBy,");
72
+            strSql.Append("deleteTime=@deleteTime,");
73
+            strSql.Append("deleteBy=@deleteBy,");
74
+
75
+            strSql.Append("isDelete=@isDelete");
76
+
77
+
62
             strSql.Append(" where ID=@ID");
78
             strSql.Append(" where ID=@ID");
63
             SqlParameter[] parameters = {
79
             SqlParameter[] parameters = {
64
                     new SqlParameter("@taskName", SqlDbType.NVarChar,200),
80
                     new SqlParameter("@taskName", SqlDbType.NVarChar,200),
65
                     new SqlParameter("@createTime", SqlDbType.DateTime),
81
                     new SqlParameter("@createTime", SqlDbType.DateTime),
66
                     new SqlParameter("@createBy", SqlDbType.Int,4),
82
                     new SqlParameter("@createBy", SqlDbType.Int,4),
83
+
84
+                 new SqlParameter("@deleteTime", SqlDbType.DateTime),
85
+                    new SqlParameter("@deleteBy", SqlDbType.Int,4),
86
+                         new SqlParameter("@isDelete", SqlDbType.Int,4),
67
                     new SqlParameter("@ID", SqlDbType.Int,4)};
87
                     new SqlParameter("@ID", SqlDbType.Int,4)};
68
             parameters[0].Value = model.taskName;
88
             parameters[0].Value = model.taskName;
69
             parameters[1].Value = model.createTime;
89
             parameters[1].Value = model.createTime;
70
             parameters[2].Value = model.createBy;
90
             parameters[2].Value = model.createBy;
71
-            parameters[3].Value = model.ID;
91
+            parameters[3].Value = model.deleteTime;
92
+
93
+            parameters[4].Value = model.deleteBy;
94
+            parameters[5].Value = model.isDelete;
95
+            parameters[6].Value = model.ID;
96
+
72
 
97
 
73
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
98
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
74
             if (rows > 0)
99
             if (rows > 0)
132
         {
157
         {
133
 
158
 
134
             StringBuilder strSql = new StringBuilder();
159
             StringBuilder strSql = new StringBuilder();
135
-            strSql.Append("select  top 1 ID,taskName,createTime,createBy from SF_Task ");
136
-            strSql.Append(" where ID=@ID");
160
+            strSql.Append("select  top 1 ID,taskName,createTime,createBy,  deleteTime  ,deleteBy      ,isDelete  from SF_Task ");
161
+            strSql.Append(" where ID=@ID and isDelete=0");
137
             SqlParameter[] parameters = {
162
             SqlParameter[] parameters = {
138
                     new SqlParameter("@ID", SqlDbType.Int,4)
163
                     new SqlParameter("@ID", SqlDbType.Int,4)
139
             };
164
             };
176
                 {
201
                 {
177
                     model.createBy = int.Parse(row["createBy"].ToString());
202
                     model.createBy = int.Parse(row["createBy"].ToString());
178
                 }
203
                 }
204
+
205
+                if (row["deleteTime"] != null && row["deleteTime"].ToString() != "")
206
+                {
207
+                    model.deleteTime = DateTime.Parse(row["deleteTime"].ToString());
208
+                }
209
+                if (row["deleteBy"] != null && row["deleteBy"].ToString() != "")
210
+                {
211
+                    model.deleteBy = int.Parse(row["deleteBy"].ToString());
212
+                }
213
+                if (row["isDelete"] != null && row["isDelete"].ToString() != "")
214
+                {
215
+                    model.isDelete = int.Parse(row["isDelete"].ToString());
216
+                }
217
+
179
             }
218
             }
180
             return model;
219
             return model;
181
         }
220
         }
186
         public DataSet GetList(string strWhere)
225
         public DataSet GetList(string strWhere)
187
         {
226
         {
188
             StringBuilder strSql = new StringBuilder();
227
             StringBuilder strSql = new StringBuilder();
189
-            strSql.Append("select ID,taskName,createTime,createBy ");
228
+            strSql.Append("select ID,taskName,createTime,createBy, deleteTime  ,deleteBy      ,isDelete ");
190
             strSql.Append(" FROM SF_Task ");
229
             strSql.Append(" FROM SF_Task ");
191
             if (strWhere.Trim() != "")
230
             if (strWhere.Trim() != "")
192
             {
231
             {
193
-                strSql.Append(" where " + strWhere);
232
+                strSql.Append(" where  " + strWhere + " and isDelete=0");
194
             }
233
             }
195
             return DbHelperSQL.Query(strSql.ToString());
234
             return DbHelperSQL.Query(strSql.ToString());
196
         }
235
         }

+ 5 - 0
codegit/CallCenterApi/CallCenterApi.DAL/his/o_sf_bingrenqk.cs

259
                 {
259
                 {
260
                     model.HZBLXX = row["HZBLXX"].ToString();
260
                     model.HZBLXX = row["HZBLXX"].ToString();
261
                 }
261
                 }
262
+
263
+                //if (row["CYHZQK"] != null)
264
+                //{
265
+                //    model.CYHZQK = row["CYHZQK"].ToString();
266
+                //}
262
             }
267
             }
263
             return model;
268
             return model;
264
         }
269
         }

File diff suppressed because it is too large
+ 657 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/MedicalFollowup/FollowUpController.cs


+ 1 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Startup.cs

26
                 Queues = new[] { "updatedata1", "updatedata2", "updatedata3", "updatedata4" }
26
                 Queues = new[] { "updatedata1", "updatedata2", "updatedata3", "updatedata4" }
27
             });
27
             });
28
             RecurringJob.AddOrUpdate<GetController>(a => a.Data1(1), Cron.Hourly, TimeZoneInfo.Local,"updatedata1");
28
             RecurringJob.AddOrUpdate<GetController>(a => a.Data1(1), Cron.Hourly, TimeZoneInfo.Local,"updatedata1");
29
-            RecurringJob.AddOrUpdate<GetController>(a => a.Data2(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata2");
29
+           RecurringJob.AddOrUpdate<GetController>(a => a.Data2(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata2");
30
             //RecurringJob.AddOrUpdate<GetController>(a => a.Data3(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata3");
30
             //RecurringJob.AddOrUpdate<GetController>(a => a.Data3(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata3");
31
             //RecurringJob.AddOrUpdate<GetController>(a => a.Data4(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata4");
31
             //RecurringJob.AddOrUpdate<GetController>(a => a.Data4(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata4");
32
         }
32
         }

+ 23 - 6
codegit/CallCenterApi/CallCenterApi.Model/SF_Task.cs

36
             private string _taskname;
36
             private string _taskname;
37
             private DateTime? _createtime = DateTime.Now;
37
             private DateTime? _createtime = DateTime.Now;
38
             private int? _createby;
38
             private int? _createby;
39
-            /// <summary>
40
-            /// 
41
-            /// </summary>
42
-            public int ID
39
+        private DateTime? _deletetime;
40
+        private int? _deleteby;
41
+        private int? _isdelete =0;
42
+
43
+        /// <summary>
44
+        /// 
45
+        /// </summary>
46
+        public int ID
43
             {
47
             {
44
                 set { _id = value; }
48
                 set { _id = value; }
45
                 get { return _id; }
49
                 get { return _id; }
68
                 set { _createby = value; }
72
                 set { _createby = value; }
69
                 get { return _createby; }
73
                 get { return _createby; }
70
             }
74
             }
71
-            #endregion Model
72
-
75
+        #endregion Model
76
+        public DateTime? deleteTime
77
+        {
78
+            set { _deletetime = value; }
79
+            get { return _deletetime; }
80
+        }
81
+        public int? deleteBy
82
+        {
83
+            set { _deleteby = value; }
84
+            get { return _deleteby; }
85
+        }
86
+        public int? isDelete {
87
+            set { _isdelete = value; }
88
+            get { return _isdelete; }
73
         }
89
         }
90
+    }
74
   }
91
   }
75
 
92
 
76
 
93
 

+ 11 - 3
codegit/CallCenterApi/CallCenterApi.Model/his/o_sf_bingrenqk.cs

59
         private string _zfy;
59
         private string _zfy;
60
         private string _zfje;
60
         private string _zfje;
61
         private string _lrrq;
61
         private string _lrrq;
62
-        private string _jdrq;
63
-        private string _blfl;
64
-        private string _hzblxx;
62
+        private string _jdrq; //建档日期
63
+        private string _blfl; //病例分类
64
+        private string _hzblxx; //患者病例信息
65
 
65
 
66
+        //private string _cyhzq;// 出院患者情况
67
+
68
+
69
+        //public string CYHZQK
70
+        //{
71
+        //    set { _cyhzq = value; }
72
+        //    get { return _cyhzq; }
73
+        //}
66
 
74
 
67
 
75
 
68
         public string HZBLXX
76
         public string HZBLXX