提交修改

codegit/CallCenterApi/CallCenterApi.DAL/his/sf_yihuxx.cs

@@ -291,7 +291,9 @@ namespace CallCenterApi.DAL
             }
             else
             {
-                return Convert.ToInt32(obj);
+                int p = 0;
+                int.TryParse(obj.ToString(),out p);
+                return p;
             }
         }
         #endregion  ExtensionMethod

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -328,6 +328,7 @@
     <None Include="Properties\PublishProfiles\Autobio_API.pubxml" />
     <None Include="Properties\PublishProfiles\DanChengAPI.pubxml" />
     <None Include="Properties\PublishProfiles\ddr.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FuWaiHuaZhongAPI.pubxml" />
     <None Include="Properties\PublishProfiles\LvDi_API.pubxml" />
     <None Include="Properties\PublishProfiles\my.pubxml" />

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

@@ -35,7 +35,7 @@ namespace CallCenterApi.Interface.Controllers.His
                 ret += "<br/>未更新数O_SF_SHOUSHUXX:" + busO_SF_SHOUSHUXX.GetRecordCount("BINGRENZYID>" + busSF_SHOUSHUXX.GetMaxCount());
 
                 ret += "<br/><br/>总数O_SF_YIHUXX:" + busO_SF_YIHUXX.GetRecordCount("");
-                ret += "<br/>未更新数O_SF_YIHUXX:" + busO_SF_YIHUXX.GetRecordCount("ZHIGONGID>"+ busSF_YIHUXX.GetMaxCount());
+                ret += "<br/>未更新数O_SF_YIHUXX:" + busO_SF_YIHUXX.GetRecordCount(string.Format("ZHIGONGID>'{0}'", busSF_YIHUXX.GetMaxCount()));
 
                 ret += "<br/><br/>总数O_SF_ZHENDUAN:" + busO_SF_ZHENDUAN.GetRecordCount("");
                 ret += "<br/>未更新数O_SF_ZHENDUAN:" + busO_SF_ZHENDUAN.GetRecordCount("BINGRENZYID>" + busSF_ZHENDUAN.GetMaxCount());
@@ -111,7 +111,7 @@ namespace CallCenterApi.Interface.Controllers.His
                 for (int i = 0; i < id; i++)
                 {
                     int n = busSF_YIHUXX.GetMaxCount();
-                    List<Model.SF_YIHUXX> modelList = busO_SF_YIHUXX.GetModelListByPage(" ZHIGONGID>" + n, "ZHIGONGID ASC", 0, 20);
+                    List<Model.SF_YIHUXX> modelList = busO_SF_YIHUXX.GetModelListByPage(string.Format(" regexp_like(ZHIGONGID,'^[0-9]+[0-9]$') AND ZHIGONGID>'{0}'", n), "ZHIGONGID ASC", 0, 20);
                     if (modelList.Count == 0) break;
                     ret = ret + busSF_YIHUXX.AddAll(modelList);
                 }

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

@@ -39,11 +39,11 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
         /// <returns></returns>
         public ActionResult GetListAll()
         {
-            string sql = "  1=1 ";
+            string sql = "  datediff(day,T1.CYRQ,'2020-11-01')<=0  ";
             DataTable dt = new DataTable();
 
             string dischargedept = HttpUtility.UrlDecode(RequestString.GetQueryString("dischargedept"));//出院科室
-            string strstate = HttpUtility.UrlDecode(RequestString.GetQueryString("state"));//状态
+            string strstate = "0";// HttpUtility.UrlDecode(RequestString.GetQueryString("state"));//状态
             string strcode = HttpUtility.UrlDecode(RequestString.GetQueryString("code"));//病案号
             string stropename = HttpUtility.UrlDecode(RequestString.GetQueryString("opename"));//手术名称
             //来电号码
@@ -110,13 +110,13 @@ namespace CallCenterApi.Interface.Controllers.MedicalFollowup
             {
                 sql += " and T1.XZZDH like '%" + strtel + "%'  ";
             }
-            if (strstarttime.Trim() != "" && strstarttime != "undefined")
+            if (strstarttime!=null&&strstarttime.Trim() != "" && strstarttime != "undefined")
             {
-                sql += " and datediff(day,a.CYRQ,'" + strstarttime + "')<=0 ";
+                sql += " and datediff(day,T1.CYRQ,'" + strstarttime + "')<=0 ";
             }
             if (strendtime.Trim() != "" && strendtime != "undefined")
             {
-                sql += " and datediff(day,a.CYRQ,'" + strendtime + "')>=0   ";
+                sql += " and datediff(day,T1.CYRQ,'" + strendtime + "')>=0   ";
             }
 
             if (strzdmc.Trim() != "" && strzdmc != "undefined")