更改自动获取数据的方法

codegit/CallCenterApi/CallCenterApi.DAL/his/o_sf_zhenduan.cs

@@ -548,7 +548,7 @@ namespace CallCenterApi.DAL
             }
             else
             {
-                strSql.Append("order by T.CZDQK25 desc");
+                strSql.Append("order by T.bingrenzyid desc");
             }
             strSql.Append(")AS r, T.*  from DIAGNOSIS_V T ");
             if (!string.IsNullOrEmpty(strWhere.Trim()))

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

@@ -54,7 +54,7 @@ namespace CallCenterApi.Interface.Controllers.His
         [HttpGet]
         public string Data1(int id)
         {
-            int ret = 0;
+            string ret ="";
             if (id > 1000)
             {
                 id = 1000;
@@ -64,12 +64,33 @@ namespace CallCenterApi.Interface.Controllers.His
                 for (int i = 0; i < id; i++)
                 {
                     FileLog.Error("i="+i);
-                    string n = busSF_BINGRENQK.GetMaxCount();
+                 //   string n = busSF_BINGRENQK.GetMaxCount();
+                    string n= busSF_BINGRENQK.GetMaxDate();
                     FileLog.Error("n=" + n);
-                    List<Model.SF_BINGRENQK> modelList = busO_SF_BINGRENQK.GetModelListByPage(" BINGRENZYID>'" + n+"'", "BINGRENZYID ASC", 0, 20);
+                    List<Model.SF_BINGRENQK> modelList = busO_SF_BINGRENQK.GetModelListByPage("CYRQ > to_date('"+n+"','yyyy-mm-dd hh24:mi:ss') ", "CYRQ ASC", 0, 20);
                   //  FileLog.Error("modelList=" + modelList.ToJson());
                     if (modelList.Count == 0) break;
-                    ret = ret + busSF_BINGRENQK.AddAll(modelList);
+
+                    List<Model.SF_SHOUSHUXX> result1 = new List<Model.SF_SHOUSHUXX>();
+                    List<Model.SF_ZHENDUAN> result2 = new List<Model.SF_ZHENDUAN>();
+                    //添加手术信息
+                    foreach (var item in modelList)
+                    {
+                        List<Model.SF_SHOUSHUXX> shoushuList = busO_SF_SHOUSHUXX.GetModelListByPage(" BINGRENZYID= '" + item.BINGRENZYID + "'", "", 0, 20);
+                        if (shoushuList.Count != 0)
+                        {
+                            result1.AddRange(shoushuList);
+                        }
+
+                        List<Model.SF_ZHENDUAN> zhenduanList = busO_SF_ZHENDUAN.GetModelListByPage(" BINGRENZYID= '" + item.BINGRENZYID + "'", "", 0, 20);
+                        if (zhenduanList.Count != 0)
+                        {
+                            result2.AddRange(zhenduanList);                           
+                        }
+                    }
+
+                    ret = ret +"病人信息表："+ busSF_BINGRENQK.AddAll(modelList) +" ；手术信息："+ busSF_SHOUSHUXX.AddAll(result1) +"；诊断信息："+ busSF_ZHENDUAN.AddAll(result2); 
+                   
                 }
             }
             catch(Exception ex) {