pref:收费处事前事中分析报错后对收费员提示，同时将是否继续结算的权限交给收费员。

Business/HisMainBusiness.cs

@@ -2657,8 +2657,18 @@ namespace PTMedicalInsurance.Business
             {
                 if (InProcessAnalysis(out errMsg) != 0)
                 {
-                    outParam = JsonHelper.setExceptionJson(-1, "InProcessAnalysis", errMsg).ToString();
-                    return -1;
+                    //outParam = JsonHelper.setExceptionJson(-1, "InProcessAnalysis", errMsg).ToString();
+                    //return -1;
+
+                    if (MessageBox.Show(errMsg + "！是否继续结算？", "事中分析提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+                    {
+
+                    }
+                    else
+                    {
+                        outParam = JsonHelper.setExceptionJson(-1, "InProcessAnalysis", errMsg).ToString();
+                        return -1;
+                    }
                 }
             }
 
@@ -2881,7 +2891,7 @@ namespace PTMedicalInsurance.Business
                 //JObject jo9001Rtn = new JObject();
                 //cBus.signIn(out jo9001Rtn);
 
-                if (trig_scen == "5")
+                if (trig_scen == "4")
                 {
                     outparam = inparam;
                 }

Business/MobilePay.cs

@@ -1242,7 +1242,7 @@ namespace PTMedicalInsurance.Business
             try
             {
                 string sqlStr = "SELECT * FROM BS_MedInsuSettlement WHERE Hospital_Dr=  " + Global.inf.hospitalDr;
-                sqlStr = sqlStr + " and AdmType = 3 and Adm_Dr= " + MPat.adm_Dr + " and SettlementID= '" + MPat.payOrdId + "'";
+                sqlStr = sqlStr + " and AdmType = 3 and Adm_Dr= " + MPat.adm_Dr + " and SettlementID= '" + MPat.settlID + "'";
                 JObject joSqlstr = new JObject();
                 joSqlstr.Add("sqlStr", sqlStr);
                 JObject joRtn = mIS.DynamicQuerySettlInfo(joSqlstr);

ChongQingMI.csproj

@@ -626,6 +626,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <None Include="Readme_重庆基线版.md" />
   </ItemGroup>
   <ItemGroup>
     <COMReference Include="stdole">

InsuBusiness.cs

@@ -813,8 +813,19 @@ namespace PTMedicalInsurance
                             {
                                 if (hBus.PreAnalysis("2", "", out errMsg) != 0)
                                 {
-                                    rtnResult = JsonHelper.setExceptionJson(-1, "事前分析", errMsg).ToString();
-                                    return rtnResult;
+                                    //rtnResult = JsonHelper.setExceptionJson(-1, "事前分析", errMsg).ToString();
+                                    //return rtnResult;
+
+
+                                    if (MessageBox.Show(errMsg + "！是否继续结算？", "事前分析提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+                                    {
+
+                                    }
+                                    else 
+                                    {
+                                        rtnResult = JsonHelper.setExceptionJson(-1, "事前分析", errMsg).ToString();
+                                        return rtnResult;
+                                    }
                                 }
                             }
 
@@ -838,8 +849,17 @@ namespace PTMedicalInsurance
 
                                 if (hBus.InProcessAnalysis( out errMsg) != 0)
                                 {
-                                    rtnResult = JsonHelper.setExceptionJson(-1, "【3102】医保明细审核事中分析服务调用失败：", errMsg).ToString();
-                                    return rtnResult;
+                                    //rtnResult = JsonHelper.setExceptionJson(-1, "【3102】医保明细审核事中分析服务调用失败：", errMsg).ToString();
+                                    //return rtnResult;
+                                    if (MessageBox.Show(errMsg + "！是否继续结算？", "事中分析提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+                                    {
+
+                                    }
+                                    else
+                                    {
+                                        rtnResult = JsonHelper.setExceptionJson(-1, "事中分析", errMsg).ToString();
+                                        return rtnResult;
+                                    }
                                 }
                             }
                             #endregion