merge: 合并最新代码

Business/HisMainBusiness.cs

@@ -112,8 +112,8 @@ namespace PTMedicalInsurance.Business
             inf.ecURL = "http://ec.yn.hsip.gov.cn/localcfc/api/hsecfc/localQrCodeQuery";
 
             //瑶海正式环境应该配置到服务器
-            inf.BusinessID = "41a8514ba8ed429eb4dde381eda02fe0";   //商务ID码 
-            inf.CreditID = "91530112MA6Q3GGC1E";                   //服务商统一社会信用代码
+            //inf.BusinessID = "41a8514ba8ed429eb4dde381eda02fe0";   //商务ID码 
+            //inf.CreditID = "91530112MA6Q3GGC1E";                   //服务商统一社会信用代码
 
             if (string.IsNullOrEmpty(inf.areaCode) || inf.areaCode.Substring(0, 4) == "3401")
             {
@@ -126,6 +126,7 @@ namespace PTMedicalInsurance.Business
                 Global.user.ID = "48664E4455CC0F8F";
             }
 
+            inf.centerURL2 = JsonHelper.getDestValue(joInpar, "CenterURL2");
             inf.cainfo = "";
         }
 
@@ -174,6 +175,7 @@ namespace PTMedicalInsurance.Business
                 Global.user.ID = "48664E4455CC0F8F";
             }
 
+            inf.centerURL2 = JsonHelper.getDestValue(joInpar, "centerURL2");
             inf.cainfo = "";
 
         }
@@ -254,7 +256,7 @@ namespace PTMedicalInsurance.Business
             outParam = "";
             string errorMsg = "";
             JObject joCardInfo = new JObject();
-            ChooseCard cc = new ChooseCard();            
+            ChooseCard cc = new ChooseCard();  
             try
             {
                 if (cc.ShowDialog() == DialogResult.OK)

Forms/ChooseCard.cs

@@ -33,6 +33,7 @@ namespace PTMedicalInsurance.Forms
             InitializeComponent();
 
             this.StartPosition = FormStartPosition.CenterParent;
+            this.cbBusinessType.SelectedIndex = 8;
         }
 
         private void btOk_Click(object sender, EventArgs e)
@@ -88,7 +89,7 @@ namespace PTMedicalInsurance.Forms
         private void ChooseCard_Load(object sender, EventArgs e)
         {
             rbgCardType.SelectedIndex = 2;      //身份证
-            cbBusinessType.SelectedIndex = 0;   //社保卡
+            cbBusinessType.SelectedIndex = 8;   //社保卡
 
             rbgOtherProv.SelectedIndex = 0;     //本地
 

Forms/SettlementChecklist.cs

@@ -516,7 +516,11 @@ namespace PTMedicalInsurance.Forms
 
                 DateTime startDate = (DateTime)joRtnSettle["result"]["data"]["reginfo"][0]["RegDate"];
                 DateTime endDate = (DateTime)joRtnSettle["result"]["data"]["settlement"][0]["SettlementTime"];
-                int diffInDays = (int)(endDate - startDate).TotalDays;
+                Global.writeLog("startDate:" + startDate.ToString());
+                Global.writeLog("endDate:" + endDate.ToString());
+
+                //int diffInDays = (int)(endDate - startDate).TotalDays;
+                int diffInDays = (endDate.Date - startDate.Date).Days;
                 if (diffInDays == 0)
                 {
                     diffInDays = 1;

HeFeiMI.csproj

@@ -32,34 +32,29 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto">
-      <HintPath>..\hefei\packages\framework\BouncyCastle.Crypto.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="FastReport, Version=2023.1.8.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
+    <Reference Include="FastReport, Version=2020.3.7.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Debug\FastReport.dll</HintPath>
+      <HintPath>..\..\原来的代码\FastReportFrom\bin\Debug\FastReport.dll</HintPath>
     </Reference>
-    <Reference Include="FastReportFrom, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Debug\FastReportFrom.dll</HintPath>
-    </Reference>
-    <Reference Include="GMUtilLib">
-      <HintPath>..\hefei\packages\framework\GMUtilLib.dll</HintPath>
+    <Reference Include="FastReportFrom">
+      <HintPath>..\..\原来的代码\FastReportFrom\bin\Debug\FastReportFrom.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Demo\bin\Debug-ChongQing\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Office.Excel.14.0.4760.1000\lib\net20\Office.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="PTControl">
-      <HintPath>..\..\..\..\C#练习\普天控件2\PTControl\PTControl\bin\Debug\PTControl.dll</HintPath>
+      <HintPath>..\沈阳\ThirdDll\PTControl.dll</HintPath>
     </Reference>
     <Reference Include="SunnyUI, Version=3.1.5.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
       <HintPath>packages\SunnyUI.3.1.5\lib\net472\SunnyUI.dll</HintPath>

Helper/InvokeHelper.cs

@@ -108,37 +108,34 @@ namespace PTMedicalInsurance.Helper
         public InvokeHelper()
         {
             IniFile ini = new IniFile(Global.curEvt.path + @"\CenterServiceURL.ini");
-           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";
-            }
-            if (Global.inf.interfaceDr == 15)//省
-            {
-                Global.inf.uploadURL = "http://10.66.155.176:80/fsi/api/fileupload/upload";
-                Global.inf.downURL = "http://10.66.155.176:80/fsi/api/fileupload/download";
-            }
-            if (Global.inf.interfaceDr == 16 || Global.inf.interfaceDr == 17)//市（瑶海） //市
-            {
-                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";
-
-            LoadCenterURL(false);
-
-        }
-
-        private void LoadCenterURL(bool reloadFromCfgFile)
-        {
-            IniFile ini = new IniFile(Global.curEvt.path + @"\CenterServiceURL.ini");
-            // 默认采用的是后台配置的地址
-            if (reloadFromCfgFile)
-            {
-                Global.inf.centerURL = ini.ReadValue("CENTER", "url");
-                Global.inf.ecURL = ini.ReadValue("CENTER", "ecToken");
-            }
+            // Global.inf.centerURL = ini.ReadValue("CENTER", "url");
+            Global.inf.uploadURL  =tools.getDestPosStrBySpliter(Global.inf.centerURL2, 1);
+            Global.inf.downURL = tools.getDestPosStrBySpliter(Global.inf.centerURL2, 2);
+            Global.inf.ecURL = tools.getDestPosStrBySpliter(Global.inf.centerURL2, 3);
+            //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.66.159.55:8080/localcfc/api/hsecfc/localQrCodeQuery";
+            //}
+            //if (Global.inf.interfaceDr == 15)//省
+            //{
+            //    Global.inf.uploadURL = "http://10.66.155.176:80/fsi/api/fileupload/upload";
+            //    Global.inf.downURL = "http://10.66.155.176:80/fsi/api/fileupload/download";
+            //    Global.inf.ecURL = "http://10.66.159.55: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";
+            // }
+            //if (Global.inf.interfaceDr == 17)//市
+            //{
+            //    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.mobilePayURL = ini.ReadValue("CENTER", "mobilePay");
             Global.inf.ecPrescURL = ini.ReadValue("CENTER", "prescription");
             // 移动支付

Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.1")]

Variables/Struct.cs

@@ -37,6 +37,7 @@ namespace PTMedicalInsurance.Variables
         public string hospitalName;
         public string hospitalNO;
         public string centerURL;
+        public string centerURL2;
         public string uploadURL;
         public string downURL;
         public string cardURL;

app.config

@@ -1,14 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 		
-		<probing prvatePath="bin/libs"/>
+		<probing prvatePath="bin/libs" />
 		
       <dependentAssembly>
-        <assemblyIdentity name="SunnyUI.Common" publicKeyToken="5a271fb7ba597231" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0"/>
+        <assemblyIdentity name="SunnyUI.Common" publicKeyToken="5a271fb7ba597231" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

packages.config

@@ -3,6 +3,8 @@
   <package id="Datatable.Activities.UiPath" version="1.0.1" targetFramework="net45" />
   <package id="Microsoft.Office.Excel" version="14.0.4760.1000" targetFramework="net45" />
   <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1001" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
+  <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
   <package id="SunnyUI" version="3.1.5" targetFramework="net472" />
   <package id="SunnyUI.Common" version="3.1.2" targetFramework="net472" />
 </packages>