perf: 住院调整

Business/Basic/PatientService.cs

@@ -47,7 +47,10 @@ namespace PTMedicalInsurance.Business
             else
             {
                 patInfo = outParam;
-                hBus.convertPatientInfo(patInfo, out outParam);
+                if (hBus.convertPatientInfo(patInfo, out outParam) != 0)
+                {
+                    return -1;
+                }
 
             }
             #region 展示患者信息

Business/HisMainBusiness.cs

@@ -418,7 +418,7 @@ namespace PTMedicalInsurance.Business
             }
         }
 
-        public void convertPatientInfo(string patInfo, out string outparam)
+        public int convertPatientInfo(string patInfo, out string outparam)
         {
             outparam = "";
             JObject joOutparam = JObject.Parse(patInfo);
@@ -482,7 +482,13 @@ namespace PTMedicalInsurance.Business
                     }
                 }
             }
+            else {
+                outparam = "收费员取消!";
+                return -1;
+            }
+
             outparam = joOutparam.ToString();
+            return 0;
         }
 
         /// <summary>
@@ -732,19 +738,21 @@ namespace PTMedicalInsurance.Business
                     diseName = frmReg.diseName??"";
 
                     JObject ExportObj = new JObject();
-                    ExportObj.Add("local_dise", frmReg.local_dise_code);  //本地病种编码
-                    ExportObj.Add("sin_dise_codg", "");              //单病种编码
+                    //ExportObj.Add("local_dise", frmReg.local_dise_code);  //本地病种编码
+                    //ExportObj.Add("sin_dise_codg", "");              //单病种编码
                     ExportObj.Add("cla_trt_flag", frmReg.claTrtFlag);       //分级诊疗标志
                     ExportObj.Add("unif_pay_std_typ", frmReg.unifPayStdType);           //包干标准类型
                     ExportObj.Add("bydise_setl_disediag_codg", "");  //按病种付费疾病诊断代码
                     ExportObj.Add("bydise_setl_oprn_oprt_code", ""); //按病种付费手册操作代码
                     ExportObj.Add("trum_flag", frmReg.traumaFlag);          //外伤标志
-                    ExportObj.Add("medcasno", "");                   //病案号
+                    //ExportObj.Add("medcasno", "");                   //病案号
                     ExportObj.Add("ipt_type", frmReg.iptTypeCode);          //住院类型
                     ExportObj.Add("rel_ttp_flag", frmReg.relTtpFlag);       //涉及第三方标志
                     ExportObj.Add("mdtrt_grp_type", frmReg.mdtrtGrpType);   //就诊人群类型
                     ExportObj.Add("iden_crit_falg", frmReg.dangerFlag);
                     ExportObj.Add("setl_way", frmReg.psn_setlway);  //结算方式
+                    ExportObj.Add("card_token", Global.pat.card.Cardtoken);  //校验
+                    ExportObj.Add("ipt_psn_sp_type", "");  //就医特殊标志
                     // 合并已有内容
                     if (!string.IsNullOrEmpty(Global.pat.ExpContent))
                     {
@@ -1319,7 +1327,7 @@ namespace PTMedicalInsurance.Business
                 }
                 else
                 {
-                    regInfo = "收费员取消操作！";
+                    regInfo = JsonHelper.setExceptionJson(-1,"门诊登记", "收费员取消操作！").ToString();
                     return -1;
                 }
             }

Business/Inpatient/IPExitCancelProcess.cs

@@ -13,12 +13,6 @@ namespace PTMedicalInsurance.Business
         public override CallResult Process(JObject input)
         {
             string errMsg = "";
-            YinHaiSafeCtrl safeCtrl = new YinHaiSafeCtrl();
-            if (safeCtrl.Prepare(TradeEnum.InpatientExitCancel.GetCode(), out errMsg) != 0)
-            {
-                return Exception("调用安全控件", errMsg);
-            }
-
             
             if (cBus.cancleRegister(TradeEnum.InpatientExitCancel, out errMsg) != 0)
             {

Business/Inpatient/IPExitProcess.cs

@@ -14,11 +14,11 @@ namespace PTMedicalInsurance.Business
         public override CallResult Process(JObject input)
         {
             string errMsg = "";
-            YinHaiSafeCtrl safeCtrl = new YinHaiSafeCtrl();
-            if (safeCtrl.Prepare(TradeEnum.InpatientExit.GetCode(), out errMsg) != 0)
-            {
-                return Exception("调用安全控件", errMsg);
-            }
+            //YinHaiSafeCtrl safeCtrl = new YinHaiSafeCtrl();
+            //if (safeCtrl.Prepare(TradeEnum.InpatientExit.GetCode(), out errMsg) != 0)
+            //{
+            //    return Exception("调用安全控件", errMsg);
+            //}
             
             JObject jo2402Inpar = JObject.Parse(JsonHelper.getDestValue(input, "DischargeRegister"));
             JObject jo2402Rtn = invoker.invokeCenterService(TradeEnum.InpatientExit, jo2402Inpar);

Business/Inpatient/IPFeeUploadCancelProcess.cs

@@ -16,12 +16,6 @@ namespace PTMedicalInsurance.Business
         public override CallResult Process(JObject input)
         {
             string errMsg = "";
-            YinHaiSafeCtrl safeCtrl = new YinHaiSafeCtrl();
-            if (safeCtrl.Prepare("2302", out errMsg) != 0)
-            {
-                return Exception("调用安全控件", errMsg);
-            }
-
            
             if (cBus.cancleFeeUpload(TradeEnum.InpatientFeeCancel, out errMsg) != 0)
             {

Business/Inpatient/IPRegistionProcess.cs

@@ -18,6 +18,13 @@ namespace PTMedicalInsurance.Business
             JObject joReg = new JObject();
             string errMsg = "";
 
+            YinHaiSafeCtrl safeCtrl = new YinHaiSafeCtrl();
+            if (safeCtrl.Prepare(TradeEnum.InpatientReg.GetCode(), out errMsg) != 0)
+            {
+                return Exception("调用安全控件", errMsg);
+            }
+
+
             string patInfo = JsonHelper.getDestValue(input, "patientInfo");
             //显示登记面板
             if (hBus.showInPatRegisterForm(patInfo,out joReg) == 0)
@@ -48,7 +55,10 @@ namespace PTMedicalInsurance.Business
                     }
 
                     // 保存时需要公共参数
-                    JObject joRegInput = JObject.Parse(JsonHelper.setCenterInpar("2401",joReg));
+                    //JObject joRegInput = JObject.Parse(JsonHelper.setCenterInpar("2401",joReg));
+                    // 因setCenterInpar对数据进行了加密
+                    dynamic joRegInput = new JObject();
+                    joRegInput.input = joReg;
 
                     //插入医保平台
                     if (mIS.saveInpatRegisterInfo(joRegInput, joRegOut, out outParam) != 0)

Business/Inpatient/IPSettlementProcess.cs

@@ -26,23 +26,21 @@ namespace PTMedicalInsurance.Business
 
             JObject joSettlement = joSettlement = JObject.Parse(JsonHelper.getDestValue(input, "Settlement"));
 
-            //基线版扩展
-            JObject joDataExp = (JObject)joSettlement["exp_content"] ?? new JObject();
-            //joDataExp.Add("cardtoken", Global.pat.card.Cardtoken);
-            joDataExp.Add("elec_bill_code", "");
-            joDataExp.Add("elec_billno_code", "");
-            joDataExp.Add("elec_bill_chkcode", "");
-
-
-            joSettlement["exp_content"] = joDataExp;
-            joSettlement.Add("data", joSettlement);
-
             YinHaiSafeCtrl safeCtrl = new YinHaiSafeCtrl();
             if (safeCtrl.Prepare(TradeEnum.InpatientSettlement.GetCode(), out errMsg) != 0)
             {
                 return Exception("调用安全控件", errMsg);
             }
 
+
+            //基线版扩展
+            JObject joDataExp = (JObject)joSettlement["exp_content"] ?? new JObject();
+            joDataExp.Add("card_token", Global.pat.card.Cardtoken);
+
+            joSettlement["exp_content"] = joDataExp;
+            joSettlement.Add("data", joSettlement);
+
+            
             JObject jo2304Rtn = invoker.invokeCenterService(TradeEnum.InpatientSettlement, joSettlement);
             if (JsonHelper.parseCenterRtnValue(jo2304Rtn, out errMsg) != 0)
             {

Business/ProcessManager.cs

@@ -1,4 +1,5 @@
 using Newtonsoft.Json.Linq;
+using PTMedicalInsurance.Common;
 using PTMedicalInsurance.Helper;
 using PTMedicalInsurance.Variables;
 using System;

Variables/TradeEnum.cs

@@ -287,13 +287,13 @@ namespace PTMedicalInsurance
         /// <summary>
         /// 2303,住院预结算
         /// </summary>
-        [Trade("2303A", "住院预结算")]
+        [Trade("2303", "住院预结算")]
         InpatientPreSettlement,
 
         /// <summary>
         /// 2304,住院结算
         /// </summary>
-        [Trade("2304A", "住院结算")]
+        [Trade("2304", "住院结算")]
         InpatientSettlement,
 
         /// <summary>