소스 검색

feat: 支持省医保清单上传4101

zhengjie 1 년 전
부모
커밋
cd695b9b48
4개의 변경된 파일21개의 추가작업 그리고 8개의 파일을 삭제
  1. 2 2
      Common/Utils.cs
  2. 8 1
      Helper/InvokeHelper.cs
  3. 6 5
      InsuBusiness.cs
  4. 5 0
      Variables/Struct.cs

+ 2 - 2
Common/Utils.cs

@@ -299,7 +299,7 @@ namespace PTMedicalInsurance.Common
                 joOutput = mapper.MapRequest<JObject, T>(request);
             }
             // 日志
-            Global.writeLog("ConvertRequest", request.ToString(),joOutput.ToString());
+            //Global.writeLog("ConvertRequest", request.ToString(),joOutput.ToString());
             return joOutput;
         }
 
@@ -328,7 +328,7 @@ namespace PTMedicalInsurance.Common
                 joOutput = mapper.MapResponse<JObject, T>(response);
             }
             // 日志
-            Global.writeLog("ConvertResponse", "", joOutput.ToString());
+            //Global.writeLog("ConvertResponse", "", joOutput.ToString());
             return joOutput;
         }
 

+ 8 - 1
Helper/InvokeHelper.cs

@@ -283,7 +283,14 @@ namespace PTMedicalInsurance.Helper
 
             // 返回结果统一转换
             joRtn = Utils.ConvertResponse<JObject>(trade,joRtn);
-
+            try
+            {
+                //保存日志
+                saveCenterLog(data, joRtn.ToString(), joInput.ToString(), joRtn.ToString());
+            }
+            catch (Exception e) { 
+                //日志异常
+            }
             return joRtn;
         }
 

+ 6 - 5
InsuBusiness.cs

@@ -101,8 +101,7 @@ namespace PTMedicalInsurance
                     {
                         if (businessType != "BasicData")//如果是打开数据对照界面不调用初始化 
                         {
-                            // 省医保不签到
-                            if (Global.inf.interfaceDr == 28)
+                            if (!Global.curEvt.needSignIn)
                             {
                                 Global.curEvt.signno = "000000";
                                 rtnResult = JsonHelper.setIrisReturnValue(0, "签到成功", joRtn).ToString();
@@ -691,12 +690,14 @@ namespace PTMedicalInsurance
                 Global.businessType = businessType;
                 string funNO = JsonHelper.getDestValue(joInParam, "funNO");
                 Global.pat.insuplc_admdvs = JsonHelper.getDestValue(joInParam, "insuplc_admdvs");
+                Global.inf.interfaceID = JsonHelper.getDestValue(joInParam, "interfaceinfo.ID");
 
-                if (funNO == "4101")
+                if ("4101".Equals(funNO))
                 {
-                    //本地医保需要使用本地机构
-                    if (!Utils.isOtherCity()) {
+                    //本地医保、省医保需要使用本地机构
+                    if (!Utils.isOtherCity() || "28".Equals(Global.inf.interfaceID)) {
                         Global.curEvt.useLocalOrgCode = true;
+                        Global.curEvt.needSignIn = true;
                         //需要单独签到
                         Global.curEvt.mac = Global.curEvt.mac + "" + Utils.GetInsuOrgCode();
                     }

+ 5 - 0
Variables/Struct.cs

@@ -260,6 +260,11 @@ namespace PTMedicalInsurance.Variables
         /// </summary>
         public bool useLocalOrgCode;
 
+        /// <summary>
+        /// 是否需要签到
+        /// </summary>
+        public bool needSignIn;
+
 
         public bool showJson;