2。随访登记 加一个电话错误，死亡（电话错误，死亡属于完成）

3. 患者数据重复

5. 过滤科室
心胸外科','肿瘤科','肾病内科','感染性疾病科','肾病内科病区','肾病内科1','肿瘤科病区','感染性疾病科病区'

codegit/CallCenterApi/CallCenterApi.DAL/his/sf_bingrenqk.cs

@@ -879,7 +879,7 @@ namespace CallCenterApi.DAL
                 strSql.Append("order by T1.BINGRENZYID desc");
             }
             strSql.Append(" )AS r, T1.*,  (SELECT TOP 1 T2.ssmc FROM sf_shoushuxx T2 WHERE T2.BINGRENZYID=T1.BINGRENZYID) ssmc,T4.*  from SF_BINGRENQK T1 ");
-            strSql.Append(" left join sf_zhenduan T3 on T3.BINGRENZYID=T1.BINGRENZYID ");
+           // strSql.Append(" left join sf_zhenduan T3 on T3.BINGRENZYID=T1.BINGRENZYID ");
             strSql.Append(" left join SF_Result T4 on T4.F_Id=T1.BINGRENZYID ");
 
             if (!string.IsNullOrEmpty(strWhere.Trim()))

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/MedicalFollowup/FollowUpController.cs

@@ -93,11 +93,11 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
             {
                 if (strstate == "2")
                 {
-                    sql += " and T4.F_Id IS NOT NULL and T4.F_Result in ('正常接通','拒访','不是本人','停机','空号','免回访')";
+                    sql += " and T4.F_Id IS NOT NULL and T4.F_Result in ('正常接通','拒访','不是本人','停机','空号','免回访','电话错误','死亡')";
                 }
                 else if (strstate == "1")
                 {
-                    sql += " and T4.F_Id IS  NULL  AND T1.CYKS NOT IN ('心胸外科','肿瘤科','肾病内科','感染性疾病科') AND T1.RYKS NOT IN ('心胸外科','肿瘤科','肾病内科','感染性疾病科') ";
+                    sql += " and T4.F_Id IS  NULL  AND T1.CYKS NOT IN ('心胸外科','肿瘤科','肾病内科','感染性疾病科','肾病内科病区','肾病内科1','肿瘤科病区','感染性疾病科病区') AND T1.RYKS NOT IN ('心胸外科','肿瘤科','肾病内科','感染性疾病科','肾病内科病区','肾病内科1','肿瘤科病区','感染性疾病科病区') ";
                 }
                 else if (strstate == "3")
                 {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Question/QuestionnaireController.cs

@@ -24,9 +24,9 @@ namespace CallCenterApi.Interface.Controllers.Question
 
 
         //患者随访完成中 填写的问卷答案
-        public ActionResult GetQuestionAnswerDetail(int id)
+        public ActionResult GetQuestionAnswerDetail(string id)
         {
-            DataTable dt = DbHelperSQL.Query($" SELECT F_QID, F_CusTelID,(SELECT F_Title FROM T_Ask_PagerInfo WHERE F_PagerId = (SELECT F_PagerId FROM  T_Ask_PagerItems WHERE F_QuestionId = F_QID)) as Name,F_Answer,F_Title FROM T_Call_OutAnswers a  LEFT JOIN T_Ask_Question b ON a.F_QID = b.F_QuestionId WHERE a.F_CusTelID =" + id + "").Tables[0];
+            DataTable dt = DbHelperSQL.Query($" SELECT F_QID, F_CusTelID,(SELECT F_Title FROM T_Ask_PagerInfo WHERE F_PagerId = (SELECT F_PagerId FROM  T_Ask_PagerItems WHERE F_QuestionId = F_QID)) as Name,F_Answer,F_Title FROM T_Call_OutAnswers a  LEFT JOIN T_Ask_Question b ON a.F_QID = b.F_QuestionId WHERE a.F_CusTelID ='" + id + "'").Tables[0];
 
 
 
@@ -1733,9 +1733,9 @@ namespace CallCenterApi.Interface.Controllers.Question
 
         //病人信息管理里的随访，参数是taskid，病人id
         //患者随访完成中 填写的问卷答案
-        public ActionResult GetQuestionAnswerDetailByTask(int id,int taskid)
+        public ActionResult GetQuestionAnswerDetailByTask(string id,int taskid)
         {
-            DataTable dt = DbHelperSQL.Query($" SELECT F_QID, F_CusTelID, (SELECT F_Title  FROM T_Ask_PagerInfo  WHERE F_PagerId = (SELECT F_PagerId  FROM T_Ask_PagerItems   WHERE F_QuestionId = F_QID)) AS Name, F_Answer, F_Title, F_TaskID FROM sf_taskAnswers a LEFT JOIN T_Ask_Question b   ON a.F_QID = b.F_QuestionId WHERE a.F_TaskID ="+taskid+" and  a.F_CusTelID =" + id + "").Tables[0];
+            DataTable dt = DbHelperSQL.Query($" SELECT F_QID, F_CusTelID, (SELECT F_Title  FROM T_Ask_PagerInfo  WHERE F_PagerId = (SELECT F_PagerId  FROM T_Ask_PagerItems   WHERE F_QuestionId = F_QID)) AS Name, F_Answer, F_Title, F_TaskID FROM sf_taskAnswers a LEFT JOIN T_Ask_Question b   ON a.F_QID = b.F_QuestionId WHERE a.F_TaskID ="+taskid+" and  a.F_CusTelID ='" + id + "'").Tables[0];
             List<returnmodel> list = new List<returnmodel>();
             foreach (DataRow item in dt.Rows)
             {