2 Commits 929f46e3ad ... ae74123f99

Author SHA1 Message Date
  zzz ae74123f99 pref: 合并旧AnHui_Base分支 1 year ago
  zhengjie 296cc62983 init: 调整:住院结算前增加读卡,更新医保凭证,解决电子凭证结算提示无效token问题 1 year ago

+ 10 - 1
Business/CenterBusiness.cs

@@ -157,7 +157,16 @@ namespace PTMedicalInsurance.Business
             {
                 dynamic jsonSignIn = new JObject();
                 dynamic jsonInput = new JObject();
-                jsonSignIn.opter_no = Global.user.ID;
+
+                if (Global.inf.interfaceDr == 12)//安徽省基线版
+                {
+                    jsonSignIn.opter_no = "A05CA9455BE8BF66";
+                }
+                if (Global.inf.interfaceDr == 16)//合肥市基线版
+                {
+                    jsonSignIn.opter_no = "7571C4995A2F4290";
+                }
+               // jsonSignIn.opter_no = Global.user.ID;
                 jsonSignIn.mac = Global.curEvt.mac;
                 
                 //MessageBox.Show(Global.inf.hospitalNO + "||" + Global.inf.CreditID + "||" + Global.inf.BusinessID);

+ 8 - 2
Business/HisMainBusiness.cs

@@ -32,6 +32,7 @@ using System.Data;
 using System.Reflection;
 using System.IO;
 using System.IO.Compression;
+using PTMedicalInsurance.Common;
 
 namespace PTMedicalInsurance.Business
 {
@@ -194,6 +195,7 @@ namespace PTMedicalInsurance.Business
             {              
                 //获取HIS和医保平台的IRIS配置信息
                 getHisConfingue(out Global.hisConfig);
+                
                 getInsuConfingue(out Global.insuConfig);
                 getLocalConfingue();
 
@@ -324,6 +326,10 @@ namespace PTMedicalInsurance.Business
                         Global.pat.insuplc_admdvs = Global.pat.card.SearchAdmCode;
                         //MessageBox.Show(Global.pat.card.SearchAdmCode + Global.pat.card.SearchAdmName);
                     }
+                    //if(Global.pat.insuplc_admdvs == "340001")
+                    //{
+                    //    Global.pat.insuplc_admdvs = "349900";
+                    //}
                 }
                 else
                 {
@@ -363,8 +369,8 @@ namespace PTMedicalInsurance.Business
                 
                 joInput.Add("data",joData);
 
-               
-                JObject joRtn = invoker.invokeCenterService("1101", JsonHelper.setCenterInpar("1101", joInput));
+                
+                 JObject joRtn = invoker.invokeCenterService("1101", JsonHelper.setCenterInpar("1101", joInput));
                 if (JsonHelper.parseCenterRtnValue(joRtn, out errorMsg) != 0)
                 {
                     outParam = "获取病人信息失败:" + errorMsg;                    

+ 1 - 0
Common/ECTokenReader.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Security.Policy;
 using System.Text;
 using System.Threading.Tasks;
 

+ 1 - 0
FormSetter/GridViewSetter.cs

@@ -219,6 +219,7 @@ namespace PTMedicalInsurance.FormSetter
         #endregion
 
 
+
         #region 设置目录下载表格
 
 

+ 17 - 4
Helper/InvokeHelper.cs

@@ -105,10 +105,22 @@ namespace PTMedicalInsurance.Helper
         public InvokeHelper()
         {
             IniFile ini = new IniFile(Global.curEvt.path + @"\CenterServiceURL.ini");
-            Global.inf.centerURL = ini.ReadValue("CENTER", "url");
-            Global.inf.uploadURL = ini.ReadValue("CENTER", "upload");
-            Global.inf.downURL = ini.ReadValue("CENTER", "download");
-            Global.inf.ecURL = ini.ReadValue("CENTER", "ecToken");
+           // Global.inf.centerURL = ini.ReadValue("CENTER", "url");
+           if (Global.inf.interfaceDr == 12)//省
+            {
+                Global.inf.uploadURL = "http://10.88.29.31:80/fsi/api/fileupload/upload";
+                Global.inf.downURL = "http://10.88.29.31:80/fsi/api/fileupload/download";
+                Global.inf.ecURL = "http://10.67.0.49:8080/localcfc/api/hsecfc/localQrCodeQuery";
+            }
+            if (Global.inf.interfaceDr == 16)//市
+            {
+                Global.inf.uploadURL = "http://10.67.240.56:80/fsi/api/fileupload/upload";
+                Global.inf.downURL = "http://10.67.240.56:80/fsi/api/fileupload/download";
+                Global.inf.ecURL = "http://10.66.159.55:8080/localcfc/api/hsecfc/localQrCodeQuery";
+             }
+           // Global.inf.uploadURL = ini.ReadValue("CENTER", "upload");
+            //Global.inf.downURL = ini.ReadValue("CENTER", "download");
+           // Global.inf.ecURL = ini.ReadValue("CENTER", "ecToken");
         }
         
         
@@ -470,6 +482,7 @@ namespace PTMedicalInsurance.Helper
             String outPar = "";
             try
             {
+                //Global.inf.centerURL = "http://10.67.240.74:8086/1.0.0/hsa-fsi-" + funNO;
                 Global.curEvt.URL = Global.inf.centerURL + funNO;
                 joRtn = invokeCenterService(data);
                 outPar = JsonHelper.Compress(joRtn);

+ 20 - 2
Helper/JsonHelper.cs

@@ -305,14 +305,23 @@ namespace PTMedicalInsurance.Helper
             Global.curEvt.msgid = Global.inf.hospitalNO + DateTime.Now.ToString("yyyyMMddHHmmssffff");
             Jo.msgid = Global.curEvt.msgid;
 
+            if (Global.pat.insuplc_admdvs == "")
+            {
+                Global.pat.insuplc_admdvs = Global.inf.areaCode;
+            }
             
-            Global.pat.insuplc_admdvs = Global.inf.areaCode;
             Global.pat.mdtrtarea_admvs = Global.inf.areaCode;
 
             // 参保地
             Jo.insuplc_admdvs = Global.pat.insuplc_admdvs;
             // 就医地
             Jo.mdtrtarea_admvs = Global.pat.mdtrtarea_admvs;
+          
+
+            if(Global.pat.insuplc_admdvs == "340001"&& infno=="1101"&& Global.inf.interfaceDr==12)
+            {
+                Jo.insuplc_admdvs = "349900";
+            }
 
             Jo.recer_sys_code = "MBS_LOCAL";
             Jo.dev_no = "2021";
@@ -320,7 +329,16 @@ namespace PTMedicalInsurance.Helper
             Jo.signtype = "SM2"; ;
             Jo.infver = "v1.0";
             Jo.opter_type = Global.user.type; ;
-            Jo.opter = Global.user.ID; ;
+            if(Global.inf.interfaceDr == 12)//安徽省基线版
+            {
+                Jo.opter = "A05CA9455BE8BF66";
+            }
+            if (Global.inf.interfaceDr == 16)//合肥市基线版
+            {
+                Jo.opter = "7571C4995A2F4290";
+            }
+
+            //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;