소스 검색

fix: bug修复

zhengjie 1 년 전
부모
커밋
d5aaa5da51
4개의 변경된 파일27개의 추가작업 그리고 10개의 파일을 삭제
  1. 8 2
      Business/Basic/PatientService.cs
  2. 6 6
      Common/Utils.cs
  3. 11 0
      Helper/InvokeDllCenter.cs
  4. 2 2
      InsuBusiness.cs

+ 8 - 2
Business/Basic/PatientService.cs

@@ -211,9 +211,15 @@ namespace PTMedicalInsurance.Business
             // 人员证件类型
             Global.pat.certType = info.baseInfo.psn_cert_type;
             // 就诊类型
-            Global.pat.mdtrtcertType = "03";
+            if(string.IsNullOrEmpty(Global.pat.mdtrtcertType))
+            {
+                Global.pat.mdtrtcertType = "03";
+            }
             // 就诊凭证号
-            Global.pat.mdtrtcertNO = Global.pat.card.NO;
+            if (!string.IsNullOrEmpty(Global.pat.card.NO))
+            {
+                Global.pat.mdtrtcertNO = Global.pat.card.NO;
+            }
             
             Global.pat.payOrdId = info.platformOrderNo;
 

+ 6 - 6
Common/Utils.cs

@@ -245,11 +245,11 @@ namespace PTMedicalInsurance.Common
             if (!Global.curEvt.ext.BaseLineMode)
             {
                 // 调试模式,可手动配置转换规则
-                if (Global.curEvt.enabledDebug)
-                {
+                //if (Global.curEvt.enabledDebug)
+                //{
                     JsonMappingForm form = new JsonMappingForm(request.ToString(),mapper.GetInputJson(),trade.GetCode());
                     form.ShowDialog();
-                }
+                //}
                 joOutput = mapper.MapRequest<JObject, T>(request);
             }
             // 日志
@@ -272,11 +272,11 @@ namespace PTMedicalInsurance.Common
             if (!Global.curEvt.ext.BaseLineMode)
             {
                 //如果没有配置转换规则,调试模式,可手动配置
-                if (Global.curEvt.enabledDebug)
-                {
+                //if (Global.curEvt.enabledDebug)
+                //{
                     JsonMappingForm form = new JsonMappingForm(response.ToString(), mapper.GetOutputJson(), trade.GetCode(),false);
                     form.ShowDialog();
-                }
+                //}
 
                 joOutput = mapper.MapResponse<JObject, T>(response);
             }

+ 11 - 0
Helper/InvokeDllCenter.cs

@@ -1,4 +1,5 @@
 using Newtonsoft.Json.Linq;
+using PTMedicalInsurance.Common;
 using PTMedicalInsurance.Variables;
 using System;
 using System.Collections.Generic;
@@ -24,6 +25,16 @@ namespace PTMedicalInsurance.Helper
                 //调用业务函数
                 StringBuilder sbOut = new StringBuilder(409600);
                 //insuplc_admdvs 社保清算机构
+                if (string.IsNullOrEmpty(Global.pat.insuplc_admdvs))
+                {
+                    if (!Utils.isOtherProvice()) {
+                        Global.pat.insuplc_admdvs = "000000"; //本地
+                    } else
+                    {
+                        Global.pat.insuplc_admdvs = "37000000";
+                    }
+                    
+                }
                 string orgCode = Global.pat.insuplc_admdvs;
                 string userCode = Global.user.ID;
                 string tradeNo = Global.curEvt.msgid;

+ 2 - 2
InsuBusiness.cs

@@ -424,13 +424,13 @@ namespace PTMedicalInsurance
                     case "M5"://门诊结算
                         {
                             Global.Set.clearingWay = "6"; //门诊
-                            OPSettlementService opService = new OPSettlementService();
+                            LocalOPSettleService opService = new LocalOPSettleService();
                             rtnResult = opService.Charge(operationType, joInParam);
                             break;
                         }
                     case "M5C"://门诊结算撤销
                         {
-                            OPSettlementService opService = new OPSettlementService();
+                            LocalOPSettleService opService = new LocalOPSettleService();
                             rtnResult = opService.DisCharge(joParam);
                             break;
                         }