zhengjie 1 gadu atpakaļ
vecāks
revīzija
d8bc607247

+ 1 - 1
Business/CenterBusiness.cs

@@ -311,8 +311,8 @@ namespace PTMedicalInsurance.Business
                 //组织入参
                 dynamic joTmp = new JObject();
                 joTmp.mdtrt_id = Global.pat.mdtrtID;
-                joTmp.adm_Dr = Global.pat.adm_Dr.ToString();
                 joTmp.psn_no = Global.pat.psn_no;
+                joTmp.expContent = "";
 
                 JObject joData = new JObject();
                 if (trade == TradeEnum.OutpatientFeeCancel)

+ 2 - 4
Business/Inpatient/IPRegistionProcess.cs

@@ -55,10 +55,8 @@ namespace PTMedicalInsurance.Business
                     }
 
                     // 保存时需要公共参数
-                    //JObject joRegInput = JObject.Parse(JsonHelper.setCenterInpar("2401",joReg));
-                    // 因setCenterInpar对数据进行了加密
-                    dynamic joRegInput = new JObject();
-                    joRegInput.input = joReg;
+                    JObject joRegInput = JObject.Parse(JsonHelper.setCenterInpar("2401",joReg,false));
+                    // 默认setCenterInpar对数据进行了加密
 
                     //插入医保平台
                     if (mIS.saveInpatRegisterInfo(joRegInput, joRegOut, out outParam) != 0)

+ 11 - 6
Helper/JsonHelper.cs

@@ -310,6 +310,10 @@ namespace PTMedicalInsurance.Helper
         }
 
         public static string setCenterInpar(string infno, JObject joInput)
+        {
+            return setCenterInpar(infno,joInput,true);
+        }
+        public static string setCenterInpar(string infno, JObject joInput,bool encyptFlag)
         {
             dynamic Jo = new JObject();
             Jo.infno = infno;
@@ -338,11 +342,7 @@ namespace PTMedicalInsurance.Helper
             Jo.cainfo = "";
             if (joInput != null)
             {
-                if (!Utils.LoadEncyptFlag(infno))
-                {
-                    Jo.Add("input", JObject.FromObject(joInput));
-                }
-                else
+                if (encyptFlag && Utils.LoadEncyptFlag(infno))
                 {
                     //新增加密
                     try
@@ -357,9 +357,14 @@ namespace PTMedicalInsurance.Helper
                     }
                     catch (Exception ex)
                     {
-                        Global.writeLog("加密异常:"+ex.Message);
+                        Global.writeLog("加密异常:" + ex.Message);
                     }
                 }
+                else
+                {
+                    // 不要求加密
+                    Jo.Add("input", JObject.FromObject(joInput));
+                }
             }
             else
             {