提交代码更新

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/His/GetController.cs

             catch (Exception ex)
             {
                 string aa = ex.Message;
-                return "-"+ret;
+                return ret + "-----------</br>"+ aa;
             }
             return ret;
 
         }
 
         [HttpGet]
-        public int Data1(int id)
+        public string Data1(int id)
         {
             int ret = 0;
             if (id > 1000)
             }
             catch(Exception ex) {
                 string aa = ex.Message;
-                return -ret; }
-            return ret;
+                return ret + "-----------</br>" + aa;
+            }
+            return ret.ToString();
 
         }
 
         [HttpGet]
-        public int Data2(int id)
+        public string Data2(int id)
         {
             int ret = 0;
             if (id > 1000)
                     ret = ret + busSF_SHOUSHUXX.AddAll(modelList);
                 }
             }
-            catch { return -ret; }
-            return ret;
+            catch (Exception ex) {
+                string aa = ex.Message;
+                return ret + "-----------</br>" + aa;
+            }
+            return ret.ToString();
 
         }
 
         [HttpGet]
-        public int Data3(int id)
+        public string Data3(int id)
         {
             int ret = 0;
             if (id > 1000)
                     ret = ret + busSF_YIHUXX.AddAll(modelList);
                 }
             }
-            catch { return -ret; }
-            return ret;
+            catch (Exception ex)
+            {
+                string aa = ex.Message;
+                return ret + "-----------</br>" + aa;
+            }
+            return ret.ToString();
 
         }
 
         [HttpGet]
-        public int Data4(int id)
+        public string Data4(int id)
         {
             int ret = 0;
             if (id > 1000)
                     ret = ret + busSF_ZHENDUAN.AddAll(modelList);
                 }
             }
-            catch { return -ret; }
-            return ret;
+            catch (Exception ex)
+            {
+                string aa = ex.Message;
+                return ret + "-----------</br>" + aa;
+            }
+            return ret.ToString();
 
         }
         /// <summary>

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

             DataTable dt = new DataTable();
 
             string dischargedept = HttpUtility.UrlDecode(RequestString.GetQueryString("dischargedept"));//出院科室
-            string strstate = "0";// HttpUtility.UrlDecode(RequestString.GetQueryString("state"));//状态
+            string strstate =  HttpUtility.UrlDecode(RequestString.GetQueryString("state"));//状态
             string strcode = HttpUtility.UrlDecode(RequestString.GetQueryString("code"));//病案号
             string stropename = HttpUtility.UrlDecode(RequestString.GetQueryString("opename"));//手术名称
             //来电号码
                 {
                     sql += " and T4.F_Id IS  NULL ";
                 }
-               
+
+            }
+            else
+            {
+                sql += " and T4.F_Id IS  NULL ";
             }
             if (strcode.Trim() != "" && strcode != "undefined")
             {