浏览代码

perf: 异地优化

zhengjie 1 年之前
父节点
当前提交
e1ee9e4d37

+ 53 - 7
Business/HisMainBusiness.cs

@@ -509,6 +509,7 @@ namespace PTMedicalInsurance.Business
                     insuplc_admvs = JsonHelper.getDestValue(joPatInfo, "selectedInsuInfo.insu_orgCode");
                 }
                 Global.pat.insuplc_admdvs = insuplc_admvs;
+
                 Global.pat.psn_insu_date = JsonHelper.getDestValue(joPatInfo, "selectedInsuInfo.psn_insu_date");
                 Global.pat.cvlserv_flag = JsonHelper.getDestValue(joPatInfo, "selectedInsuInfo.cvlserv_flag");
                 Global.pat.balc = JsonHelper.getDestValue(joPatInfo, "selectedInsuInfo.balc");
@@ -581,6 +582,10 @@ namespace PTMedicalInsurance.Business
             }
             JObject joHisRtnInfo = JObject.Parse(diagnoses);
 
+            // 南昌处理异地参保地
+            Utils.GetInsuCode();
+
+
             //组织登记入参
             JObject joReg = new JObject();
             try
@@ -799,6 +804,14 @@ namespace PTMedicalInsurance.Business
                     joMdtrtinfo.Add("insuplc_admdvs", Global.pat.insuplc_admdvs);          //参保地医保区划
                     joMdtrtinfo.Add("mdtrtarea_admvs", Global.inf.areaCode);          //就医地医保区划
 
+                    //南昌新增
+                    joMdtrtinfo.Add("card_sn", Global.pat.card.SN);
+                    joMdtrtinfo.Add("psn_cert_type", Global.pat.certType);
+                    joMdtrtinfo.Add("certno", Global.pat.certNO);
+                    joMdtrtinfo.Add("psn_type", Global.pat.psn_type);
+                    joMdtrtinfo.Add("psn_name", Global.pat.name);
+
+
                     joReg.Add("mdtrtinfo", joMdtrtinfo);
                     joReg.Add("diseinfo", jaConvertedDiagnoses);
 
@@ -836,6 +849,10 @@ namespace PTMedicalInsurance.Business
             outParam = "";
             try
             {
+
+                // 南昌处理异地参保地
+                Utils.GetInsuCode();
+
                 JArray jaDiagnoses = JArray.Parse(JsonHelper.getDestValue(joHisRtnInfo, "diseinfo"));
                 //选择结算方式等
                 InpatientRegistration frmReg = new InpatientRegistration();
@@ -1049,16 +1066,23 @@ namespace PTMedicalInsurance.Business
                     joSetlInpar.Add("dscgTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
 
                     JObject joDataExp = new JObject();
-                    joDataExp.Add("cla_trt_flag", "");
-                    joDataExp.Add("deve_flag", "");
-                    joDataExp.Add("ipt_type", frmReg.iptTypeCode);
-                    joDataExp.Add("treat_way", frmReg.treatway_code);
-
+                    //joDataExp.Add("cla_trt_flag", "");
+                    //joDataExp.Add("deve_flag", "");
+                    //joDataExp.Add("ipt_type", frmReg.iptTypeCode);
+                    //joDataExp.Add("treat_way", frmReg.treatway_code);
                     //joDataExp.Add("brith_check_subs", 0);  //产前检查补贴费用
                     //joDataExp.Add("rb_hifes_pay", 0);//人保企事业补充险支出
 
                     joSetlInpar.Add("exp_content", joDataExp); //11111
 
+                    //南昌新增
+                    joSetlInpar.Add("card_sn", Global.pat.card.SN);
+                    joSetlInpar.Add("psn_cert_type", Global.pat.certType);
+                    joSetlInpar.Add("certno", Global.pat.certNO);
+                    joSetlInpar.Add("psn_type", Global.pat.psn_type);
+                    joSetlInpar.Add("psn_name", Global.pat.name);
+
+
                     JObject joOut = new JObject();
                     joOut.Add("DischargeRegister", joRegInpar);
                     joOut.Add("Settlement", joSetlInpar);
@@ -1089,7 +1113,12 @@ namespace PTMedicalInsurance.Business
                 regInfo = JsonHelper.setExceptionJson(-1, "getPatDiagnoses", diagnoses).ToString();
                 return -1;
             }
-            JObject joHisRtnInfo = JObject.Parse(diagnoses);            
+            JObject joHisRtnInfo = JObject.Parse(diagnoses);
+
+
+            // 南昌处理异地参保地
+            Utils.GetInsuCode();
+
 
             //组织入参
             JObject joReg = new JObject();
@@ -1201,7 +1230,16 @@ namespace PTMedicalInsurance.Business
                     joRegInpar.Add("dept_name", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.adm_dept_name"));
                     joRegInpar.Add("exp_content", "");
                     joRegInpar.Add("caty", "A10");
-                    
+
+                    //南昌新增
+                    joRegInpar.Add("card_sn", Global.pat.card.SN);
+                    joRegInpar.Add("psn_cert_type", Global.pat.certType);
+                    joRegInpar.Add("certno", Global.pat.certNO);
+                    joRegInpar.Add("psn_type", Global.pat.psn_type);
+                    joRegInpar.Add("psn_name", Global.pat.name);
+                    joRegInpar.Add("insuplc_admdvs", Global.pat.insuplc_admdvs);
+                    joRegInpar.Add("mdtrtarea_admvs", Global.inf.areaCode);
+
                     #endregion
 
                     #region 组织就诊信息入参
@@ -1259,6 +1297,14 @@ namespace PTMedicalInsurance.Business
                     joSetlInpar.Add("insutype", frmReg.insuType);//险种类型
                     joSetlInpar.Add("pub_hosp_rfom_flag", "");
                     joSetlInpar.Add("exp_content", "");
+
+                    //南昌新增
+                    joSetlInpar.Add("card_sn", Global.pat.card.SN);
+                    joSetlInpar.Add("psn_cert_type", Global.pat.certType);
+                    joSetlInpar.Add("certno", Global.pat.certNO);
+                    joSetlInpar.Add("psn_type", Global.pat.psn_type);
+                    joSetlInpar.Add("psn_name", Global.pat.name);
+
                     #endregion
 
                     joReg.Add("data", joRegInpar);

+ 2 - 6
Business/Local/ReadCardProcess.cs

@@ -28,7 +28,6 @@ namespace PTMedicalInsurance.Business
                 if (dialog  == DialogResult.OK)
                 {
                     Global.businessType = "";
-                    Utils.GetInsuCode();
                     Global.pat.certType = "01";
 
                     //电子凭证
@@ -38,7 +37,7 @@ namespace PTMedicalInsurance.Business
                         Global.pat.mdtrtcertType = "01";
                         Global.businessType = cc.businessType;
                         tradeEcToken(out outParam);
-                        //return trade1161(out outParam);
+                        trade1101(out outParam);
                         return Success();
 
                     }
@@ -69,7 +68,6 @@ namespace PTMedicalInsurance.Business
 
                         Global.pat.mdtrtcertType = "03";
                         
-                        //return trade1161(out outParam);
                         int rtn = 0;
                         if (!Global.curEvt.enabledDebug)
                         {
@@ -141,7 +139,7 @@ namespace PTMedicalInsurance.Business
                 //joRtn["output"]["baseinfo"]["bizCode"] = Global.pat.card.BusinessCode;
                 outParam = joRtn.ToString();
                 parsePatient(joRtn);
-
+                
                 return 0;
             }
         }
@@ -234,8 +232,6 @@ namespace PTMedicalInsurance.Business
             //cardInfo
             outParam = ECTokenReader.ECQuery("1");
 
-            trade1101(out outParam);
-
             return 0;
         }
 

+ 1 - 0
Common/CardReader.cs

@@ -217,6 +217,7 @@ namespace PTMedicalInsurance.Common
             Global.pat.insuplc_admdvs = data[startIndex]; //行政区划
 
             Global.pat.card.SN = card.card_sn;
+            Global.pat.certType = "01";
             Global.pat.certNO = card.certno;
             Global.pat.name = card.psn_name;
             Global.pat.card.NO = card.cardno;

+ 10 - 5
Common/Utils.cs

@@ -208,10 +208,15 @@ namespace PTMedicalInsurance.Common
             {
                 Global.pat.insuplc_admdvs = Global.inf.areaCode;
             }
-            if (Global.pat.OtherProv == 1)
-            {
-                Global.pat.insuplc_admdvs = Global.pat.card.SearchAdmCode;
+            Global.writeLog("参保地判断:"+ Global.pat.insuplc_admdvs);
+
+            //自动识别是否异地
+            if (isOtherCity() || isOtherProvice()) {
+                //南昌异地固定参保地
+                Global.writeLog("【异地】");
+                Global.pat.insuplc_admdvs = "369900";
             }
+           
             return Global.pat.insuplc_admdvs;
         }
 
@@ -230,7 +235,7 @@ namespace PTMedicalInsurance.Common
         /// <returns></returns>
         public static bool isOtherProvice(string areaCode)
         {
-            if (!string.IsNullOrEmpty(areaCode) && areaCode.Length>2 && areaCode.Substring(0, 2) != "21")
+            if (!string.IsNullOrEmpty(areaCode) && areaCode.Length>2 && areaCode.Substring(0, 2) != "36")
             {
                 return true;
             }
@@ -261,7 +266,7 @@ namespace PTMedicalInsurance.Common
         /// <returns></returns>
         public static bool isOtherCity(string areaCode)
         {
-            if (!string.IsNullOrEmpty(areaCode) && areaCode.Length > 4 && areaCode.Substring(0, 4) != "3701")
+            if (!string.IsNullOrEmpty(areaCode) && areaCode.Length > 4 && areaCode.Substring(0, 4) != "3601")
             {
                 return true;
             }

+ 5 - 5
Forms/ChooseCard.cs

@@ -53,11 +53,11 @@ namespace PTMedicalInsurance.Forms
             //    }
             //}
 
-            if ((rbgOtherProv.SelectedIndex == 1)&&(cbCBD.Text==""))
-            {
-                MessageBox.Show("异地结算,请选择统筹区!");
-                return;
-            }
+            //if ((rbgOtherProv.SelectedIndex == 1)&&(cbCBD.Text==""))
+            //{
+            //    MessageBox.Show("异地结算,请选择统筹区!");
+            //    return;
+            //}
             // 身份证
             if (rbgCardType.SelectedIndex == 1)
             {

+ 1 - 1
Forms/ChooseCard.designer.cs

@@ -374,7 +374,7 @@
             this.rbgOtherProv.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.rbgOtherProv.Items.AddRange(new object[] {
             "本地",
-            "异地(参保地必选)"});
+            "异地"});
             this.rbgOtherProv.ItemSize = new System.Drawing.Size(180, 35);
             this.rbgOtherProv.Location = new System.Drawing.Point(0, 78);
             this.rbgOtherProv.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);

+ 3 - 3
Helper/InvokeHelper.cs

@@ -46,15 +46,15 @@ namespace PTMedicalInsurance.Helper
                 Global.inf.ecURL = ini.ReadValue("CENTER", "ecToken");
                 Global.inf.mobilePayURL = ini.ReadValue("CENTER", "mobilePay");
                 Global.inf.ecPrescURL = ini.ReadValue("CENTER", "prescription");
-                // 移动支付及电子处方
+                // 移动支付
                 if (string.IsNullOrEmpty(Global.inf.mobilePayURL))
                 {
                     Global.inf.mobilePayURL = "http://10.123.185.12:8080";
                 }
-
+                // 电子处方
                 if (string.IsNullOrEmpty(Global.inf.ecPrescURL))
                 {
-                    Global.inf.ecPrescURL = "http://10.123.185.12:8080/epc/api";
+                    Global.inf.ecPrescURL = "http://10.77.245.22:9001/epc/api";
                 }
             }
         }