Browse Source

feat: 新增病种信息保存及入院登记保存优化

zhengjie 1 year ago
parent
commit
9988c6fffd

BIN
.vs/MedicalInsurance/v16/.suo


BIN
.vs/ShenYangMI/v16/.suo


BIN
.vs/slnx.sqlite


+ 7 - 3
Business/HisMainBusiness.cs

@@ -817,7 +817,7 @@ namespace PTMedicalInsurance.Business
                     joMdtrtinfo.Add("dise_type_code", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.dise_type_code"));          //病种类型
                     joMdtrtinfo.Add("dise_type_code", JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.dise_type_code"));          //病种类型
                     joMdtrtinfo.Add("exp_content", ExportObj);          //字段扩展
                     joMdtrtinfo.Add("exp_content", ExportObj);          //字段扩展
                     joMdtrtinfo.Add("insuplc_admdvs", Global.pat.insuplc_admdvs);          //参保地医保区划
                     joMdtrtinfo.Add("insuplc_admdvs", Global.pat.insuplc_admdvs);          //参保地医保区划
-                    joMdtrtinfo.Add("mdtrtarea_admvs", Global.inf.areaCode);          //就医地医保区划
+                    joMdtrtinfo.Add("mdtrtarea_admvs", Global.pat.mdtrtarea_admvs);          //就医地医保区划
 
 
                     // 异地就医标志 (济南个性化)
                     // 异地就医标志 (济南个性化)
                     //string otherAreaFlag = "10";
                     //string otherAreaFlag = "10";
@@ -843,8 +843,8 @@ namespace PTMedicalInsurance.Business
                     Global.pat.disCode = diseCodg;
                     Global.pat.disCode = diseCodg;
                     Global.pat.disName = diseName;
                     Global.pat.disName = diseName;
                     Global.pat.medType = frmReg.med_type;
                     Global.pat.medType = frmReg.med_type;
-                    regInfo = (JObject)joReg.DeepClone();
-                    //regInfo = JObject.Parse(JsonHelper.setCenterInpar("2401", joReg)); ;
+                    //保存到his,需要增加请求中心公共参数
+                    regInfo = JObject.Parse(JsonHelper.setCenterInpar("2401", joReg));
                     return 0;
                     return 0;
                 }
                 }
                 else
                 else
@@ -1010,6 +1010,10 @@ namespace PTMedicalInsurance.Business
                     string diseCodg = "", diseName = "";
                     string diseCodg = "", diseName = "";
                     diseCodg = frmReg.diseCodg;
                     diseCodg = frmReg.diseCodg;
                     diseName = frmReg.diseName;
                     diseName = frmReg.diseName;
+                    //仅保存界面选择的病种信息
+                    Global.pat.discDiagCode = diseCodg;
+                    Global.pat.discDiagName = diseName;
+
                     if (string.IsNullOrEmpty(frmReg.diseCodg))
                     if (string.IsNullOrEmpty(frmReg.diseCodg))
                     {
                     {
                         diseCodg = JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.dscg_maindiag_code");
                         diseCodg = JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.dscg_maindiag_code");

+ 1 - 9
Business/Inpatient/IPRegCancelProcess.cs

@@ -17,15 +17,7 @@ namespace PTMedicalInsurance.Business
             //取消中心登记
             //取消中心登记
             if (cBus.cancleRegister(TradeEnum.InpaitentRegCancel, out outParam) != 0)
             if (cBus.cancleRegister(TradeEnum.InpaitentRegCancel, out outParam) != 0)
             {
             {
-                //如果医保中心没有HIS所传的医保登记信息则默认撤销HIS登记信息
-                int i = outParam.IndexOf("不存在有效的就诊登记信息");
-                if (i != 0)
-                {
-                    if (DialogResult.Yes != MessageBox.Show("医保中心提示:" + outParam + ",是否强制撤销HIS医保登记信息?", "提示", MessageBoxButtons.YesNo))
-                    {
-                        return Exception("中心取消登记失败,", outParam);
-                    }
-                }
+                return Exception("中心取消登记失败,", outParam);
             }
             }
 
 
             //取消医保平台登记
             //取消医保平台登记

+ 0 - 7
Business/Inpatient/IPRegistionProcess.cs

@@ -48,13 +48,6 @@ namespace PTMedicalInsurance.Business
                     }
                     }
 
 
                     JObject joRegInput = (JObject)joReg.DeepClone();
                     JObject joRegInput = (JObject)joReg.DeepClone();
-                    //兼容
-                    if (!joRegInput.ContainsKey("input"))
-                    {
-                        joRegInput = new JObject();
-                        joRegInput["input"] = joReg;
-                    }
-
 
 
                     //插入医保平台
                     //插入医保平台
                     if (mIS.saveInpatRegisterInfo(joRegInput, joRegOut, out outParam) != 0)
                     if (mIS.saveInpatRegisterInfo(joRegInput, joRegOut, out outParam) != 0)

+ 3 - 1
Business/IrisServices.cs

@@ -1375,7 +1375,9 @@ namespace PTMedicalInsurance.Business
                 joSetlinfo.Add("HISAdmTime", Global.Set.hisAdmTime);
                 joSetlinfo.Add("HISAdmTime", Global.Set.hisAdmTime);
                 joSetlinfo.Add("HISDischargeTime", Global.Set.hisDischargeTime);
                 joSetlinfo.Add("HISDischargeTime", Global.Set.hisDischargeTime);
                 joSetlinfo.Add("SettlementWay", Global.Set.settlementWay);
                 joSetlinfo.Add("SettlementWay", Global.Set.settlementWay);
-
+                //新增保存病种信息
+                joSetlinfo.Add("DiseasecCode", Global.pat.discDiagCode);
+                joSetlinfo.Add("DiseasecName", Global.pat.discDiagName);
 
 
                 JObject joRtn = invoker.invokeInsuService(JsonHelper.setIrisInpar("09010051", joSetlinfo).ToString(), "插入结算信息");
                 JObject joRtn = invoker.invokeInsuService(JsonHelper.setIrisInpar("09010051", joSetlinfo).ToString(), "插入结算信息");