Browse Source

perf: 优化

zhengjie 1 year ago
parent
commit
00fef10ef5
2 changed files with 23 additions and 23 deletions
  1. 0 5
      Business/Basic/PatientService.cs
  2. 23 18
      Business/HisMainBusiness.cs

+ 0 - 5
Business/Basic/PatientService.cs

@@ -50,11 +50,6 @@ namespace PTMedicalInsurance.Business
             else
             {
                 patInfo = outParam;
-                //展示患者信息界面(合并到后面登记界面)
-                //if (hBus.showPatInfo(patInfo, out outParam) != 0)
-                //{
-                //    return JsonHelper.setExceptionJson(-100, "操作员取消!", outParam).ToString();
-                //}
                 hBus.convertPatientInfo(patInfo, out outParam);
 
             }

+ 23 - 18
Business/HisMainBusiness.cs

@@ -473,27 +473,32 @@ namespace PTMedicalInsurance.Business
             JObject jaBaseInfo = JObject.Parse(JsonHelper.getDestValue(joConvertCodeRtn, "baseinfo"));
             joOutput["baseinfo"] = jaBaseInfo;
 
-            JObject joSelectedInsuInfo = (JObject)jaInsuInfo[0];
-            joSelectedInsuInfo.Add("mdtrt_cert_type", Global.pat.mdtrtcertType);
-            joSelectedInsuInfo.Add("mdtrt_cert_no", Global.pat.mdtrtcertNO);
-            if (joOutparam["selectedInsuInfo"] != null)
+            PatientInsuInfo frmPatientInfo = new PatientInsuInfo(joConvertCodeRtn);
+            //相关信息转换到登记面板
+            if (frmPatientInfo.ShowDialog() == DialogResult.OK)
             {
-                joOutparam["selectedInsuInfo"] = joSelectedInsuInfo;
-            }
-            else
-            {
-                joOutparam.Property("output").AddBeforeSelf(new JProperty("selectedInsuInfo", joSelectedInsuInfo));
-            }
+                JObject joSelectedInsuInfo = (JObject)jaInsuInfo[frmPatientInfo.insuInfoIndex];
 
-            if (joOutparam["selectedIdInfo"] != null)
-            {
-                joOutparam["selectedIdInfo"] = joSelectedInsuInfo;
-            }
-            else
-            {
-                joOutparam.Property("output").AddBeforeSelf(new JProperty("selectedIdInfo", joSelectedInsuInfo));
-            }
+                joSelectedInsuInfo.Add("mdtrt_cert_type", Global.pat.mdtrtcertType);
+                joSelectedInsuInfo.Add("mdtrt_cert_no", Global.pat.mdtrtcertNO);
+                if (joOutparam["selectedInsuInfo"] != null)
+                {
+                    joOutparam["selectedInsuInfo"] = joSelectedInsuInfo;
+                }
+                else
+                {
+                    joOutparam.Property("output").AddBeforeSelf(new JProperty("selectedInsuInfo", joSelectedInsuInfo));
+                }
 
+                if (joOutparam["selectedIdInfo"] != null)
+                {
+                    joOutparam["selectedIdInfo"] = joSelectedInsuInfo;
+                }
+                else
+                {
+                    joOutparam.Property("output").AddBeforeSelf(new JProperty("selectedIdInfo", joSelectedInsuInfo));
+                }
+            }
 
             outparam = joOutparam.ToString();
         }