pref：合并代码

Business/HisMainBusiness.cs

@@ -2192,7 +2192,7 @@ namespace PTMedicalInsurance.Business
             if (Global.curEvt.ext.isOpenAnalysis)
             {
                 string outMsg;
-                if (InProcessAnalysis(out outMsg) != 0)
+                if (InProcessAnalysis("5",out outMsg) != 0)
                 {
                     outParam = "【3102】医保明细审核事中分析服务调用失败：" + outMsg;
                     return -1;
@@ -2429,7 +2429,7 @@ namespace PTMedicalInsurance.Business
         /// </summary>
         /// <param name="outparam"></param>
         /// <returns></returns>
-        public int InProcessAnalysis(out string outparam)
+        public int InProcessAnalysis(string trig_scen,out string outparam)
         {
             outparam = "";
             try
@@ -2445,7 +2445,7 @@ namespace PTMedicalInsurance.Business
                 {
                     return -1;
                 }
-                outparam = preAnalysis.Get3101Inpar("5", Global.pat).ToString();
+                outparam = preAnalysis.Get3101Inpar(trig_scen, Global.pat).ToString();
                 JObject joRtn = invoker.invokeCenterService("3102", JsonHelper.setCenterInpar("3102", outparam));
                 return JsonHelper.parseCenterRtnValue(joRtn, out outparam);
             }

Business/PreAndInProcessAnalysis.cs

@@ -224,7 +224,7 @@ namespace PTMedicalInsurance.Business
         private static string getAreaCode()
         {
             string areaCode = Global.pat.insuplc_admdvs ?? Global.inf.areaCode;
-            if (Global.pat.OtherProv == 1)
+            if (Global.pat.bOtherProvLocal )
             {
                 areaCode = Global.pat.card.SearchAdmCode;
             }

Forms/PreAndInProcessAnalysisForm.cs

@@ -25,6 +25,7 @@ namespace PTMedicalInsurance.Forms
         private GridViewSetter grdSetter = new GridViewSetter();
         private JArray jaVolaItems;
         public JArray jaWarns ;
+        public string JrID = "";
 
         private bool _isUpdatingProgrammatically = false; //使用标志位防止代码触发
         public PreAndInProcessAnalysisForm()
@@ -62,6 +63,7 @@ namespace PTMedicalInsurance.Forms
             cbxDspoWay.Text = "";
             _isUpdatingProgrammatically = false;
             tbJrID.Text = JsonHelper.getDestValue(jo, "jr_id");
+            JrID = tbJrID.Text;
             tbRuleID.Text = JsonHelper.getDestValue(jo, "rule_id");
             tbPatID.Text = JsonHelper.getDestValue(jo, "patn_id");
             tbMdtrdID.Text = JsonHelper.getDestValue(jo, "mdtrt_id");

Variables/Struct.cs

@@ -36,6 +36,7 @@ namespace PTMedicalInsurance.Variables
         public int hisHospitalDr;
         public int hospitalDr;
         public string hospitalName;
+        public string HospitalLevel;
         public string hospitalNO;
         public string centerURL;
         public string presCenterURL;
@@ -259,6 +260,8 @@ namespace PTMedicalInsurance.Variables
         public string dspoWayRea;
         public string minpacunt_drug_trac_cnt; //本次结算应上传最小包装追溯码数量
         public string mcs_trac_cnt; //本次结算应上传耗材追溯码数量
+
+        public string wltpayAmt;
     }
 
     //当前环境实时信息