pref: ICPC下载优化

Business/DataImoport.cs

@@ -514,14 +514,28 @@ namespace PTMedicalInsurance
             }
 
             JArray array = JArray.Parse(JsonHelper.getDestValue(dataRtn, "result"));
+            if (array.Count < 2) {
+                return JsonHelper.setIrisReturnValue(-1, "没有更多的数据了!", null);
+            }
             foreach (var obj in array)
             {
                 obj["updateUserID"]= Global.user.ID;
                 obj["HospitalDr"] = Global.inf.hospitalDr;
                 obj["InterfaceDr"] = Global.inf.interfaceDr;
+                if (string.IsNullOrEmpty(obj["Name"].Text()) && !string.IsNullOrEmpty(obj["LocateName"].Text()))
+                {
+                    obj["Name"] = obj["LocateName"];
+                }
                 if (trade == TradeEnum.ICPC3Treatment)
                 {
-                    obj["Code"] = obj["NationalCode"] + "-" + obj["Code"];
+                    if (string.IsNullOrEmpty(obj["Code"].Text()))
+                    {
+                        obj["Code"] = obj["NationalCode"];
+                    }
+                    else
+                    {
+                        obj["Code"] = obj["NationalCode"] + "-" + obj["Code"];
+                    }
                 }
             }
 

Forms/BasicData.cs

@@ -853,16 +853,31 @@ namespace PTMedicalInsurance.Forms
         private int downloadMedData(TradeEnum trade,string version,Sunny.UI.UIProcessBar uiProcessBar)
         {
             string errorMessage = "";
+            if (rbAutoDown.Checked)
+            {
+                JObject joMaxVerNO = mIS.getDirectoryMaxVersionNO(rbgDirecType.SelectedIndex);
+                string ver = joMaxVerNO["result"]["MaxVersionNO"].ToString();
+                if (!string.IsNullOrEmpty(ver))
+                {
+                    version = ver;
+                    tbVer.Text = ver;
+                }
+            }
             JObject joRtn = cBus.DownDirecotry(trade, version);
             if (JsonHelper.parseCenterRtnValue(joRtn, out errorMessage) == 0)
             {
                 //解析
-                DataImoport DI = new DataImoport();
+             DataImoport DI = new DataImoport();
                 JObject joImportRtn = DI.importMedDataToIris(trade,joRtn,uiProcessBar);
                 if (JsonHelper.parseIrisRtnValue(joImportRtn, out errorMessage) == 0)
                 {
-                    return 0;
+                    //递归调用
+                    if (rbAutoDown.Checked)
+                    {
+                        downloadMedData(trade, version, uiProcessBar);
+                    }
                 }
+                 return 0;
             }
             MessageBox.Show(errorMessage);
             return -1;

Helper/InvokeHelper.cs

@@ -230,7 +230,7 @@ namespace PTMedicalInsurance.Helper
             switch (trade)
             {
                 case TradeEnum.FileUpload:
-                    prefix = Global.inf.uploadURL;
+                    prefix = Global.inf.uploadURL??Global.inf.centerURL;
                     break;
                 case TradeEnum.FileDownload:
                     prefix = Global.inf.downURL;