fix:取消COMMON.ShowAppDiaglog的置顶，它置顶了导致其他窗口出不来。

Business/Local/ReadCardProcess.cs

@@ -26,7 +26,7 @@ namespace PTMedicalInsurance.Business
             string msg;
             try
             {            
-                cc.TopMost = true;
+                //cc.TopMost = true;
                 DialogResult dialog = tools.ShowAppDiaglog(cc);
                 
                 if (dialog == DialogResult.OK)

Common/Common.cs

@@ -785,21 +785,21 @@ namespace PTMedicalInsurance.Common
         /// <returns></returns>
         public static DialogResult ShowAppDiaglog(Form winForm)
         {
-            //IntPtr hWind = WinApi.GetWindowHandle("prBrowser");
-            ////IntPtr hWind = WinApi.GetWindowHandle("SimulateCallDll");
-            //DialogResult dialog = DialogResult.None;
-            //if (hWind != IntPtr.Zero)
-            //{
-            //    dialog = winForm.ShowDialog(new WindowWrapper(hWind));
-            //}
-            //else
-            //{
-            //    dialog = winForm.ShowDialog();
-            //}
-            //return dialog;            
-
-            //winForm.TopMost = true;
-            return winForm.ShowDialog();
+            IntPtr hWind = WinApi.GetWindowHandle("prBrowser");
+            //IntPtr hWind = WinApi.GetWindowHandle("SimulateCallDll");
+            DialogResult dialog = DialogResult.None;
+            if (hWind != IntPtr.Zero)
+            {
+                dialog = winForm.ShowDialog(new WindowWrapper(hWind));
+            }
+            else
+            {
+                dialog = winForm.ShowDialog();
+            }
+            return dialog;
+
+            ////winForm.TopMost = true;
+            //return winForm.ShowDialog();
         }
 
 

Forms/ChooseCard.cs

@@ -95,6 +95,7 @@ namespace PTMedicalInsurance.Forms
         {
             cardType = "0" + (rbgCardType.SelectedIndex +1).ToString();
             businessType = "01"+cbBusinessType.Text.Substring(0,3);
+            
 
             bYDSBK = chk_WSSBK.Checked;
 
@@ -227,7 +228,7 @@ namespace PTMedicalInsurance.Forms
                 Global.pat.card.SearchAdmKey = cbCBD.Text;
                 Adm.StartPosition = FormStartPosition.CenterParent;
 
-                if (Adm.ShowDialog() == DialogResult.OK)
+                if (tools.ShowAppDiaglog(Adm) == DialogResult.OK)
                 {
                     cbCBD.Text = Global.pat.card.SearchAdmName;
                     if (!string.IsNullOrEmpty(Global.pat.card.SearchAdmCode))
@@ -253,6 +254,7 @@ namespace PTMedicalInsurance.Forms
             DataRowView dataRow = row.DataBoundItem as DataRowView;
 
             psnCertType = dataRow["Code"].ToString().Trim();
+            Global.pat.certType = psnCertType;
             //insuTypeName = dataRow["Name"].ToString().Trim();
         }
 

Helper/InvokeHelper.cs

@@ -243,7 +243,16 @@ namespace PTMedicalInsurance.Helper
                 LoadCenterURL(true);
             }
             Global.curEvt.URL = Global.inf.centerURL + funNo;
+            Global.curEvt.funNo = funNo;
+            if (Global.curEvt.funNo.Contains("CFYLJG"))
+            {
+                //Global.curEvt.URL = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/" + Global.curEvt.funNo;
 
+                //电子处方测试
+                Global.inf.apiSecretKey = "4poYlzt2jteX1pT3tijh7BqyWH4Lp0zN";
+                Global.inf.passid = "sztest_hosp";
+                Global.curEvt.URL = "http://hosp-sz.gd.hsip.gov.cn/ebus/sztest_hosp/poc/hsa/hgs/" + Global.curEvt.funNo;
+            }
             string data = JsonHelper.setCenterInpar(funNo, joInput);
             return invokeCenterService(data);
         }

Helper/InvokeRestCenter.cs

@@ -52,15 +52,17 @@ namespace PTMedicalInsurance.Helper
             JObject joRtn = new JObject();
             try
             {
-                if (Global.curEvt.funNo.Contains("CFYLJG"))
-                {
-                    //Global.curEvt.URL = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/" + Global.curEvt.funNo;
 
-                    //电子处方测试
-                    Global.inf.apiSecretKey = "4poYlzt2jteX1pT3tijh7BqyWH4Lp0zN";
-                    Global.inf.passid = "sztest_hosp";
-                    Global.curEvt.URL = "http://hosp-sz.gd.hsip.gov.cn/ebus/sztest_hosp/poc/hsa/hgs/" + Global.curEvt.funNo;
-                }
+                //if (Global.curEvt.funNo.Contains("CFYLJG"))
+                //{
+                //    //Global.curEvt.URL = "http://igb.hsa.gdgov.cn/ebus/gdyb_inf/poc/hsa/hgs/" + Global.curEvt.funNo;
+
+                //    //电子处方测试
+                //    Global.inf.apiSecretKey = "4poYlzt2jteX1pT3tijh7BqyWH4Lp0zN";
+                //    Global.inf.passid = "sztest_hosp";
+                //    Global.curEvt.URL = "http://hosp-sz.gd.hsip.gov.cn/ebus/sztest_hosp/poc/hsa/hgs/" + Global.curEvt.funNo;
+                //}
+
                 //创建一个HTTP请求  
                 HttpWebRequest request = (HttpWebRequest)WebRequest.Create(Global.curEvt.URL);
                 //Post请求方式  
@@ -87,11 +89,11 @@ namespace PTMedicalInsurance.Helper
                 //Sha256 加密生成的签名 x-tif-signature = sha256(x-tif-timestamp + secretKey+ x-tif-nonce + xtif-timestamp)
                 string signature = Encrypt.SHA256EncryptStr(sTemp);
 
-
                 nonce = GetRandomString(32); // 随机数
                 //timestamp = GetCurrentUnixSeconds().ToString();
                 signature = GetSHA256Str($"{timestamp}{secretKey}{nonce}{timestamp}"); // 签名
 
+
                 //Global.writeLog($"nonce:{nonce}\ntimestamp:{timestamp}\nsecretKey:{secretKey}\npassid:{passid}\nsignature:{signature}");
 
                 //增加头部信息
@@ -117,7 +119,7 @@ namespace PTMedicalInsurance.Helper
                 try
                 {
                     //获得响应流
-                    response = (HttpWebResponse)request.GetResponse();           
+                    response = (HttpWebResponse)request.GetResponse();
                 }
                 catch (WebException ex)
                 {
@@ -286,7 +288,7 @@ namespace PTMedicalInsurance.Helper
             if (response != null)
             {
                 Stream s = response.GetResponseStream();
-                StreamReader sRead = new StreamReader(s,Encoding.GetEncoding("UTF-8"));
+                StreamReader sRead = new StreamReader(s, Encoding.GetEncoding("UTF-8"));
                 data = sRead.ReadToEnd();
                 sRead.Close();
                 response.Close();
@@ -294,5 +296,7 @@ namespace PTMedicalInsurance.Helper
             return data;
         }
 
+
+
     }
 }

Readme_南昌基线版.md

@@ -1,31 +0,0 @@
-## 医保业务DLL库使用说明：
-  该项目遵循以下原则：
-
-  1. Master为空项目，仅保留说明文件，便于其他新分支的建立
-
-  2. 按市+医保类型建立代码分支，如“安徽基线版”，分支名为:AnHui_Base，医保类型包括：Base(基线版)、工伤(Injury)、异地（Offsite)、其它（Other），如果没有可适当增加
-
-  3. 每个分支下存放每个省的业务逻辑代码项目，项目名应遵循与分支名保持一致，如AnHui_Base
-
-  4. 每个分支的根目录应保留本Readme.md文档，同时应将各个分支的特殊业务场景或版本更新日志放到此文档
-
-  5. 使用手册见文档：https://dqqslxaq2y.feishu.cn/docx/VxZhdSrFDonnwTxxTPZctr7onSb?from=from_copylink
- 
-
-## 业务分支说明（分支特性，请做相应调整）
- 名称：重庆医保
-	接口开发：东软
-	上线范围：结算（社保、身份证、电子医保卡）、进销存、事前事中、Lis项目、清单上传
-
-### 版本特性:
-  - 住院结算，默认不采用个人账户支付（结算界面默认不选中）
-
-  - 本地和异地结算单打印样式不同
-
-  - 对码界面增加了“价格”显示
-
-  - 只有省外异地（直辖市）
-
-  版本 1.0.0.1
-	对账界面增加 “过滤总金额与现金支付相等的数据” 
-  

ShenZhenMI.csproj

@@ -38,7 +38,7 @@
       <HintPath>packages\BouncyCastle.1.8.9\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="FastReportFrom">
-      <HintPath>..\..\原来的代码\FastReportFrom\bin\Debug\FastReportFrom.dll</HintPath>
+      <HintPath>..\..\..\ThirdDLL\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>
@@ -598,7 +598,6 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Readme.md" />
   </ItemGroup>
   <ItemGroup>
     <COMReference Include="stdole">