fix:bug

Business/CenterBusiness.cs

@@ -106,7 +106,7 @@ namespace PTMedicalInsurance.Business
                 jofsDownloadIn.fixmedins_code = filename;
 
                 jo9102InParam.fsDownloadIn = jofsDownloadIn;
-                return  invoker.DownloadCenterFile(JsonHelper.setCenterInpar("9102", jo9102InParam.ToString()));
+                return  invoker.DownloadCenterFile(JsonHelper.setCenterInpar("9102", jo9102InParam));
 
             }
             catch (Exception ex)

Helper/InvokeRestCenter.cs

@@ -73,6 +73,7 @@ namespace PTMedicalInsurance.Helper
                     return -1;
                 }
                 outputData = getResponseData(response);
+                Global.writeLog("原始数据返回："+outputData);
                 joRtn = JObject.Parse(outputData);//返回Json数据
                 if (joRtn.ContainsKey("body"))
                 {
@@ -121,7 +122,7 @@ namespace PTMedicalInsurance.Helper
 
                 FileStream fs = new FileStream(filePath, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
                 //创建一个HTTP请求  
-                Global.curEvt.URL = Global.inf.downURL;
+                Global.curEvt.URL = Global.inf.downURL??Global.inf.centerURL;
                 HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Global.curEvt.URL);
 
                 //Post请求方式  

Helper/JsonHelper.cs

@@ -243,33 +243,7 @@ namespace PTMedicalInsurance.Helper
         /// <returns></returns>
         public static string setCenterInpar_plain(string infno, JObject joInput)
         {
-            dynamic Jo = new JObject();
-            Jo.infno = infno;
-            Global.curEvt.msgid = Global.inf.hospitalNO + DateTime.Now.ToString("yyyyMMddHHmmssffff");
-            Jo.msgid = Global.curEvt.msgid;
-            Jo.mdtrtarea_admvs = Global.inf.areaCode;
-            Global.pat.mdtrtarea_admvs = Jo.mdtrtarea_admvs;
-            Jo.insuplc_admdvs = Global.pat.insuplc_admdvs;
-            Jo.recer_sys_code = Global.inf.recivedSystem;
-            Jo.dev_no = Global.inf.dev_no;
-            Jo.dev_safe_info = Global.inf.dev_safe_info; //设备编号
-            Jo.cainfo = Global.inf.cainfo;//设备安全信息
-            Jo.signtype = Global.inf.signatureType; ;
-            Jo.infver = Global.inf.version; ;
-            Jo.opter_type = Global.user.type; ;
-            Jo.opter = Global.user.ID; ;
-            Jo.opter_name = Global.user.name; ;
-            Jo.inf_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            Jo.fixmedins_code = Global.inf.hospitalNO;
-            Jo.fixmedins_name = Global.inf.hospitalName;
-            Jo.sign_no = Global.curEvt.signno;
-            Jo.enc_type = "";
-
-            Jo.Add("input", joInput);
-
-            var request = Utils.Wrapper(Jo);
-
-            return request.ToString();
+            return setCenterInpar(infno, joInput);
         }
 
         /// <summary>
@@ -331,19 +305,19 @@ namespace PTMedicalInsurance.Helper
         public static string setCenterInpar(string infno, JObject joInput)
         {
             dynamic Jo = new JObject();
-            Jo.info = infno;
+            Jo.infno = infno;
             Global.curEvt.msgid = Global.inf.hospitalNO + DateTime.Now.ToString("yyyyMMddHHmmssffff");
             Jo.msgid = Global.curEvt.msgid;
             Global.pat.mdtrtarea_admvs = Global.inf.areaCode;
 
             // 参保地医保区划
-            Jo.insuplc_admdvs = Global.pat.insuplc_admdvs ?? Global.inf.areaCode;
+            Jo.insuplc_admdvs = Global.pat.insuplc_admdvs??"";
             // 就医地
             Jo.mdtrtarea_admvs = Global.pat.mdtrtarea_admvs;
 
             Jo.recer_sys_code = "SY";
-            Jo.dev_no = "F4939FF0EC33";
-            Jo.dev_safe_info = Global.inf.dev_safe_info; //设备编号
+            Jo.dev_no = "00FFF254308F";
+            Jo.dev_safe_info = ""; //设备编号
             Jo.signtype = "SM3"; ;
             Jo.infver = "v1.0";
             Jo.opter_type = Global.user.type; ;
@@ -351,62 +325,11 @@ namespace PTMedicalInsurance.Helper
             Jo.opter_name = Global.user.name; ;
             Jo.inf_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             Jo.fixmedins_code = Global.inf.hospitalNO;
-            Jo.sign_no = Global.curEvt.signno;
-            Jo.cainfo = encrypt.signWithSM2(Jo);
-
-            if (joInput != null)
-            {
-                Jo.Add("input", joInput);
-            }
-            else
-            {
-                Jo.Add("input", "");
-            }
-            return JsonHelper.toJsonString(Jo);
-        }
-        /// <summary>
-        /// 组织中心入参
-        /// </summary>
-        /// <param name="infno"></param>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public static string setCenterInparBase(string infno, JObject joInput)
-        {
-
-            dynamic Jo = new JObject();
-            Jo.infno = infno;
-            Global.curEvt.msgid = Global.inf.hospitalNO + DateTime.Now.ToString("yyyyMMddHHmmssffff");
-            Jo.msgid = Global.curEvt.msgid;
-            Global.pat.mdtrtarea_admvs = Global.inf.areaCode;
-
-            // 参保地
-            Jo.insuplc_admdvs = Global.pat.insuplc_admdvs;
-            // 就医地
-            Jo.mdtrtarea_admvs = Global.pat.mdtrtarea_admvs;
-
-            Jo.recer_sys_code = "MBS_LOCAL";
-            Jo.dev_no = "2021";
-            Jo.dev_safe_info = Global.inf.dev_safe_info; //设备编号
-            Jo.signtype = "SM2"; ;
-            Jo.infver = "v1.0";
-            Jo.opter_type = Global.user.type; ;
-            Jo.opter = Global.user.ID; ;
-            Jo.opter_name = Global.user.name; ;
-            Jo.inf_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-            Jo.fixmedins_code = Global.inf.hospitalNO;
             Jo.fixmedins_name = Global.inf.hospitalName;
             Jo.sign_no = Global.curEvt.signno;
-            //Jo.app_id = "";
-            Jo.enc_type = "";
-            //Jo.pw_ecToken = "";
-
-            // 报文签名(不包含cainfo和input)
-            //EncryptHelper encrypt = new EncryptHelper();
-            Jo.cainfo = ""; // encrypt.signWithSM2(Jo);
-            // 服务商信息
-            //Jo.serv_code = "HH00029";
-            //Jo.serv_sign = "0C9BC4D70BDE653D8E";
-
+            //Jo.cainfo = encrypt.signWithSM2(Jo);
+            Jo.cainfo = "0416509a2c98da94f3840cfb45c6119365a0e166f608d7d1002d70f377ceb46cb0f0f483a20df1eb75e96e8498b9184106d9d8361bf37550ae8d228d6ad3e7127eb0de8868606f18f7a840f238200ab201cd5f10ec4f1490529d9e4c599f2a78dd1917287003ada3699fcc1046e493db974572386f898f3c9c96c5e0ea348e7dc0";
+            // 沈阳cainfo为固定值
             if (joInput != null)
             {
                 Jo.Add("input", joInput);
@@ -415,10 +338,12 @@ namespace PTMedicalInsurance.Helper
             {
                 Jo.Add("input", "");
             }
+
             var request = Utils.Wrapper(Jo);
+
             return JsonHelper.toJsonString(request);
-            
         }
+        
 
         /// <summary>
         /// 组织Iris入参

Variables/TradeEnum.cs

@@ -26,7 +26,7 @@ namespace PTMedicalInsurance
         /// <summary>
         /// 1161,读卡并获取个人信息
         /// </summary>
-        [Trade("1101", "读卡并获取个人信息", ModeEnum.DLL)]
+        [Trade("1101", "读卡并获取个人信息")]
         ReadCardInfo,
 
         /// <summary>
@@ -167,7 +167,7 @@ namespace PTMedicalInsurance
         /// <summary>
         /// 1901（字典下载）
         /// </summary>
-        [Trade("1901", "字典下载", ModeEnum.DLL)]
+        [Trade("1901", "字典下载")]
         DictionaryDownload,
 
         #endregion
@@ -216,19 +216,19 @@ namespace PTMedicalInsurance
         OutpatientFeeCancel,
 
         // 2206
-        [Trade("2206", "门诊预结算", ModeEnum.DLL)]
+        [Trade("2206", "门诊预结算")]
         OutpatientPreSettlement,
 
         /// <summary>
         /// 2207,门诊结算
         /// </summary>
-        [Trade("2207", "门诊结算", ModeEnum.DLL)]
+        [Trade("2207", "门诊结算")]
         OutpatientSettlement,
 
         /// <summary>
         /// 2208,门诊结算取消
         /// </summary>
-        [Trade("2208", "门诊结算取消", ModeEnum.DLL)]
+        [Trade("2208", "门诊结算取消")]
         OutpatientSettlementCancel,
 
         #endregion
@@ -237,61 +237,61 @@ namespace PTMedicalInsurance
         /// <summary>
         /// 2401,入院登记
         /// </summary>
-        [Trade("2401", "入院登记", ModeEnum.DLL)]
+        [Trade("2401", "入院登记")]
         InpatientReg,
 
         /// <summary>
         /// 2402,出院办理
         /// </summary>
-        [Trade("2402", "出院办理", ModeEnum.DLL)]
+        [Trade("2402", "出院办理")]
         InpatientExit,
 
         /// <summary>
         /// 2403，入院信息变更
         /// </summary>
-        [Trade("2403", "入院信息变更", ModeEnum.DLL)]
+        [Trade("2403", "入院信息变更")]
         InpatientInfoChange,
 
         /// <summary>
         /// 2404,撤销入院登记
         /// </summary>
-        [Trade("2404", "撤销入院登记", ModeEnum.DLL)]
+        [Trade("2404", "撤销入院登记")]
         InpaitentRegCancel,
 
         /// <summary>
         /// 2405,出院撤销
         /// </summary>
-        [Trade("2405", "出院撤销", ModeEnum.DLL)]
+        [Trade("2405", "出院撤销")]
         InpatientExitCancel,
 
         /// <summary>
         /// 2301，住院费用明细上传
         /// </summary>
-        [Trade("2301", "住院费用明细上传", ModeEnum.DLL)]
+        [Trade("2301", "住院费用明细上传")]
         InpatientFeeUpload,
 
         /// <summary>
         /// 2302,住院费用明细撤销
         /// </summary>
-        [Trade("2302", "住院费用明细撤销", ModeEnum.DLL)]
+        [Trade("2302", "住院费用明细撤销")]
         InpatientFeeCancel,
 
         /// <summary>
         /// 2303,住院预结算
         /// </summary>
-        [Trade("2303", "住院预结算", ModeEnum.DLL)]
+        [Trade("2303", "住院预结算")]
         InpatientPreSettlement,
 
         /// <summary>
         /// 2304,住院结算
         /// </summary>
-        [Trade("2304", "住院结算", ModeEnum.DLL)]
+        [Trade("2304", "住院结算")]
         InpatientSettlement,
 
         /// <summary>
         /// 2305,住院结算撤销
         /// </summary>
-        [Trade("2305", "住院结算撤销", ModeEnum.DLL)]
+        [Trade("2305", "住院结算撤销")]
         InpatientSettlementCancel,
 
         #endregion
@@ -300,34 +300,34 @@ namespace PTMedicalInsurance
         /// <summary>
         /// 2501，转院备案
         /// </summary>
-        [Trade("2501", "转院备案", ModeEnum.DLL)]
+        [Trade("2501", "转院备案")]
         TransferRecord,
 
         /// <summary>
         /// 2501A，转院备案
         /// </summary>
-        [Trade("2501A", "转院备案", ModeEnum.DLL)]
+        [Trade("2501A", "转院备案")]
         TransferRecordA,
 
         // 3101
-        [Trade("3101", "事前分析", ModeEnum.DLL)]
+        [Trade("3101", "事前分析")]
         PreAnalysis,
 
         // 3102
-        [Trade("3102", "事中分析", ModeEnum.DLL)]
+        [Trade("3102", "事中分析")]
         InProcessAnalysis,
 
         /// <summary>
         /// 3201,费用结算对总账
         /// </summary>
-        [Trade("3201", "费用结算对总账", ModeEnum.DLL)]
+        [Trade("3201", "费用结算对总账")]
         FeeSummaryCheck,
 
 
         /// <summary>
         /// 3202,费用结算对明细账
         /// </summary>
-        [Trade("3202", "费用结算对明细账", ModeEnum.DLL)]
+        [Trade("3202", "费用结算对明细账")]
         FeeDetailCheck,
 
         #endregion