Selaa lähdekoodia

更新4101地址获取逻辑

353489937@qq.com 11 kuukautta sitten
vanhempi
commit
a7daa8d5ac
5 muutettua tiedostoa jossa 52 lisäystä ja 7 poistoa
  1. BIN
      .vs/JiNanMI/v16/.suo
  2. 1 0
      Common/Utils.cs
  3. 22 1
      Forms/PreAndInProcessAnalysisForm.cs
  4. 17 2
      Helper/InvokeHelper.cs
  5. 12 4
      InsuBusiness.cs

BIN
.vs/JiNanMI/v16/.suo


+ 1 - 0
Common/Utils.cs

@@ -271,6 +271,7 @@ namespace PTMedicalInsurance.Common
         /// <returns></returns>
         public static bool isOtherCity(string areaCode)
         {
+            Global.writeLog("areaCode:"+ areaCode);
             if (!string.IsNullOrEmpty(areaCode) && areaCode.Length > 4 && areaCode.Substring(0, 4) != "3701")
             {
                 return true;

+ 22 - 1
Forms/PreAndInProcessAnalysisForm.cs

@@ -1,6 +1,7 @@
 using Newtonsoft.Json.Linq;
 using PTMedicalInsurance.FormSetter;
 using PTMedicalInsurance.Helper;
+using PTMedicalInsurance.Variables;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -101,7 +102,27 @@ namespace PTMedicalInsurance.Forms
             joTmp.Add("dspoWay", cbxDspoWay.SelectedIndex );
             joTmp.Add("dspoWayRea", rtbDspoWayRea.Text);
 
-            jaWarns.Add(joTmp);
+            bool isExist = false;
+            Global.writeLog("11:" + joTmp["warnRsltId"].ToString());
+            foreach (JObject joSub in jaWarns)
+            {
+                Global.writeLog(joSub["warnRsltId"].ToString());
+                
+                if (joSub["warnRsltId"].ToString() == joTmp["warnRsltId"].ToString())
+                {
+                    isExist = true;
+                }
+            }
+
+            if (!isExist)
+            {
+                jaWarns.Add(joTmp);
+                dgvVolaItems.Rows[i].DefaultCellStyle.BackColor = Color.Red;
+                MessageBox.Show("保存成功,请继续下一条");//如果重复点击,则覆盖,同时有标识标识改数据已经添加成功
+            }
+
+            
+
         }
     }
 }

+ 17 - 2
Helper/InvokeHelper.cs

@@ -253,8 +253,23 @@ namespace PTMedicalInsurance.Helper
                     prefix = Global.inf.downURL;
                     break;
                 case TradeEnum.PreAnalysis:
-                    //prefix = @"http://10.153.50.218:8001/hsu/mihs/MihsServlet"; //正式
-                    prefix = @"http://10.153.50.179:8001/hsu/mihs/MihsServlet"; //测试
+                    /*
+                     * c济南市参保人事前提醒机构医保正式对接地址:http://10.153.50.218:8001/hsu/mihs/MihsServlet
+                        济南市参保人事前提醒机构医保测试对接地址:http://10.153.50.179:8001/hsu/mihs/MihsServlet
+                        省直参保人事前提醒机构医保正式对接地址:http://10.112.63.89:18080/hsu/mihs/MihsServlet 
+                        省直参保人事前提醒机构医保测试对接地址:http://10.112.63.89:8001/hsu/mihs/MihsServlet
+                     * */
+                    if (Global.inf.hospitalDr == 28)
+                    {
+                        prefix = @"http://10.112.63.89:18080/hsu/mihs/MihsServlet "; //省医保正式
+                    }
+                    else
+                    {
+                        prefix = @"http://10.153.50.218:8001/hsu/mihs/MihsServlet"; //市医保正式
+                        //prefix = @"http://10.153.50.179:8001/hsu/mihs/MihsServlet"; //测试
+                    }
+
+
                     break;
                 default:
                     prefix = Global.inf.centerURL;

+ 12 - 4
InsuBusiness.cs

@@ -678,14 +678,22 @@ namespace PTMedicalInsurance
 
                 if ("4101".Equals(funNO))
                 {
-                    //本地医保、省医保需要使用本地机构
-                    if (!Utils.isOtherCity() || "28".Equals(Global.inf.interfaceID)) {
-                        Global.curEvt.useLocalOrgCode = true;
-                        Global.curEvt.needSignIn = true;
+                    Global.curEvt.useLocalOrgCode = true;
+                    Global.curEvt.needSignIn = true;
+                    Global.writeLog(Global.pat.insuplc_admdvs)  ;
+                    //本地医保、省医保医保需要使用本地机构
+                    if ((!Utils.isOtherCity()) || "28".Equals(Global.inf.interfaceID))
+                    {
                         //需要单独签到
                         Global.curEvt.mac = Global.curEvt.mac + "" + Utils.GetInsuOrgCode();
                     }
+                    else //异地的
+                    {
+                        Global.curEvt.mac = Global.curEvt.mac + Global.inf.hospitalNO;
+                    }
+
                 }
+                Global.writeLog(Global.curEvt.mac);
 
                 //BS架构调用方式问题,每次调用都需要重新初始化
                 if (init(InParam, out outParam) != 0)