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

codegit/CallCenterApi/CallCenterApi.DAL/SF_Task.cs

@@ -27,17 +27,27 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into SF_Task(");
-            strSql.Append("taskName,createTime,createBy)");
+            strSql.Append("taskName,createTime,createBy, deleteTime  ,deleteBy      ,isDelete )");
             strSql.Append(" values (");
-            strSql.Append("@taskName,@createTime,@createBy)");
+            strSql.Append("@taskName,@createTime,@createBy, @deleteTime  ,@deleteBy      ,@isDelete )");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@taskName", SqlDbType.NVarChar,200),
                     new SqlParameter("@createTime", SqlDbType.DateTime),
-                    new SqlParameter("@createBy", SqlDbType.Int,4)};
+                    new SqlParameter("@createBy", SqlDbType.Int,4),
+             new SqlParameter("@deleteTime", SqlDbType.DateTime),
+                    new SqlParameter("@deleteBy", SqlDbType.Int,4),
+                      new SqlParameter("@isDelete", SqlDbType.Int,4)
+
+
+            };
             parameters[0].Value = model.taskName;
             parameters[1].Value = model.createTime;
             parameters[2].Value = model.createBy;
+            parameters[3].Value = model.deleteTime;
+            parameters[4].Value = model.deleteBy;
+
+            parameters[5].Value = model.isDelete;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -58,17 +68,32 @@ namespace CallCenterApi.DAL
             strSql.Append("update SF_Task set ");
             strSql.Append("taskName=@taskName,");
             strSql.Append("createTime=@createTime,");
-            strSql.Append("createBy=@createBy");
+            strSql.Append("createBy=@createBy,");
+            strSql.Append("deleteTime=@deleteTime,");
+            strSql.Append("deleteBy=@deleteBy,");
+
+            strSql.Append("isDelete=@isDelete");
+
+
             strSql.Append(" where ID=@ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@taskName", SqlDbType.NVarChar,200),
                     new SqlParameter("@createTime", SqlDbType.DateTime),
                     new SqlParameter("@createBy", SqlDbType.Int,4),
+
+                 new SqlParameter("@deleteTime", SqlDbType.DateTime),
+                    new SqlParameter("@deleteBy", SqlDbType.Int,4),
+                         new SqlParameter("@isDelete", SqlDbType.Int,4),
                     new SqlParameter("@ID", SqlDbType.Int,4)};
             parameters[0].Value = model.taskName;
             parameters[1].Value = model.createTime;
             parameters[2].Value = model.createBy;
-            parameters[3].Value = model.ID;
+            parameters[3].Value = model.deleteTime;
+
+            parameters[4].Value = model.deleteBy;
+            parameters[5].Value = model.isDelete;
+            parameters[6].Value = model.ID;
+
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -132,8 +157,8 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 ID,taskName,createTime,createBy from SF_Task ");
-            strSql.Append(" where ID=@ID");
+            strSql.Append("select  top 1 ID,taskName,createTime,createBy,  deleteTime  ,deleteBy      ,isDelete  from SF_Task ");
+            strSql.Append(" where ID=@ID and isDelete=0");
             SqlParameter[] parameters = {
                     new SqlParameter("@ID", SqlDbType.Int,4)
             };
@@ -176,6 +201,20 @@ namespace CallCenterApi.DAL
                 {
                     model.createBy = int.Parse(row["createBy"].ToString());
                 }
+
+                if (row["deleteTime"] != null && row["deleteTime"].ToString() != "")
+                {
+                    model.deleteTime = DateTime.Parse(row["deleteTime"].ToString());
+                }
+                if (row["deleteBy"] != null && row["deleteBy"].ToString() != "")
+                {
+                    model.deleteBy = int.Parse(row["deleteBy"].ToString());
+                }
+                if (row["isDelete"] != null && row["isDelete"].ToString() != "")
+                {
+                    model.isDelete = int.Parse(row["isDelete"].ToString());
+                }
+
             }
             return model;
         }
@@ -186,11 +225,11 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select ID,taskName,createTime,createBy ");
+            strSql.Append("select ID,taskName,createTime,createBy, deleteTime  ,deleteBy      ,isDelete ");
             strSql.Append(" FROM SF_Task ");
             if (strWhere.Trim() != "")
             {
-                strSql.Append(" where " + strWhere);
+                strSql.Append(" where  " + strWhere + " and isDelete=0");
             }
             return DbHelperSQL.Query(strSql.ToString());
         }

codegit/CallCenterApi/CallCenterApi.DAL/his/o_sf_bingrenqk.cs

@@ -259,6 +259,11 @@ namespace CallCenterApi.DAL
                 {
                     model.HZBLXX = row["HZBLXX"].ToString();
                 }
+
+                //if (row["CYHZQK"] != null)
+                //{
+                //    model.CYHZQK = row["CYHZQK"].ToString();
+                //}
             }
             return model;
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Startup.cs

@@ -26,7 +26,7 @@ namespace CallCenterApi.Interface
                 Queues = new[] { "updatedata1", "updatedata2", "updatedata3", "updatedata4" }
             });
             RecurringJob.AddOrUpdate<GetController>(a => a.Data1(1), Cron.Hourly, TimeZoneInfo.Local,"updatedata1");
-            RecurringJob.AddOrUpdate<GetController>(a => a.Data2(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata2");
+           RecurringJob.AddOrUpdate<GetController>(a => a.Data2(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata2");
             //RecurringJob.AddOrUpdate<GetController>(a => a.Data3(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata3");
             //RecurringJob.AddOrUpdate<GetController>(a => a.Data4(1), Cron.Hourly, TimeZoneInfo.Local, "updatedata4");
         }

codegit/CallCenterApi/CallCenterApi.Model/SF_Task.cs

@@ -36,10 +36,14 @@ namespace CallCenterApi.Model
             private string _taskname;
             private DateTime? _createtime = DateTime.Now;
             private int? _createby;
-            /// <summary>
-            /// 
-            /// </summary>
-            public int ID
+        private DateTime? _deletetime;
+        private int? _deleteby;
+        private int? _isdelete =0;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int ID
             {
                 set { _id = value; }
                 get { return _id; }
@@ -68,9 +72,22 @@ namespace CallCenterApi.Model
                 set { _createby = value; }
                 get { return _createby; }
             }
-            #endregion Model
-
+        #endregion Model
+        public DateTime? deleteTime
+        {
+            set { _deletetime = value; }
+            get { return _deletetime; }
+        }
+        public int? deleteBy
+        {
+            set { _deleteby = value; }
+            get { return _deleteby; }
+        }
+        public int? isDelete {
+            set { _isdelete = value; }
+            get { return _isdelete; }
         }
+    }
   }
 
 

codegit/CallCenterApi/CallCenterApi.Model/his/o_sf_bingrenqk.cs

@@ -59,10 +59,18 @@ namespace CallCenterApi.Model
         private string _zfy;
         private string _zfje;
         private string _lrrq;
-        private string _jdrq;
-        private string _blfl;
-        private string _hzblxx;
+        private string _jdrq; //建档日期
+        private string _blfl; //病例分类
+        private string _hzblxx; //患者病例信息
 
+        //private string _cyhzq;// 出院患者情况
+
+
+        //public string CYHZQK
+        //{
+        //    set { _cyhzq = value; }
+        //    get { return _cyhzq; }
+        //}
 
 
         public string HZBLXX