1.修改结算单，取his入出院诊断信息

Forms/SettlementChecklist.cs

@@ -502,9 +502,25 @@ namespace PTMedicalInsurance.Forms
                 {
                      medrcdno= joRtnDiag["mdtrtinfo"]["medrcdno"].ToString();
                 }
-                #endregion 
-                #region【数据转换】
-                if (joRtnSettle["result"]["data"]["settlement"][0]["Gender"].ToString() == "1")
+                JArray jaDiags= JArray.Parse(JsonHelper.getDestValue(joRtnDiag, "diseinfo"));
+                string ryzd = "";
+                string cyzd = "";
+                for (int i = 0; i < jaDiags.Count; i++)
+                {
+                    if (jaDiags[i]["diaTypeCode"].ToString() == "ADD"|| jaDiags[i]["maindiag_flag"].ToString() == "1") //ADD 入院 OPD 门诊
+                    {
+                        ryzd = jaDiags[i]["diag_name"].ToString();
+                    }
+                    if (jaDiags[i]["diaTypeCode"].ToString() == "DIS" || jaDiags[i]["maindiag_flag"].ToString() == "1") //ADD 入院 OPD 门诊
+                    {
+                        cyzd = jaDiags[i]["diag_name"].ToString();
+                    }
+                }
+
+
+                    #endregion
+                    #region【数据转换】
+                    if (joRtnSettle["result"]["data"]["settlement"][0]["Gender"].ToString() == "1")
                 {
                     joRtnSettle["result"]["data"]["settlement"][0]["Gender"] = "男";
                 }
@@ -584,7 +600,9 @@ namespace PTMedicalInsurance.Forms
                 jaAmountChiness.Add("AccountMutualAidAmount", AccountMutualAidAmount);
                 jaAmountChiness.Add("InPolicyRangeAmount", InPolicyRangeAmount); //合规费用
                 jaAmountChiness.Add("SettlOpter", Global.user.name);
-                jaAmountChiness.Add("medrcdno", medrcdno);                
+                jaAmountChiness.Add("medrcdno", medrcdno);
+                jaAmountChiness.Add("ryzd", ryzd);
+                jaAmountChiness.Add("cyzd", cyzd);
 
                 JArray jachinessParams = new JArray();
                 jachinessParams.Add(jaAmountChiness);

Helper/JsonHelper.cs

@@ -568,13 +568,13 @@ namespace PTMedicalInsurance.Helper
             Global.inf.MBkey = "";
             if (Global.inf.interfaceDr == 12)//安徽省基线版-瑶海Jo.appKey
             {
-                Jo.appKey = "A05CA9455BE8BF66";
-                Global.inf.MBkey= "";
+                Jo.appKey = "BM7T2y5QnPhteXzS";
+                Global.inf.MBkey= "aYr5XNRKW5SFsDFY";
             }
             if (Global.inf.interfaceDr == 16)//合肥市基线版-瑶海
             {
-                Jo.appKey = "7571C4995A2F4290";
-                Global.inf.MBkey = "";
+                Jo.appKey = "BM7T2y5QnPhteXzS"; 
+                Global.inf.MBkey = "aYr5XNRKW5SFsDFY";
             }
             if (Global.inf.interfaceDr == 15)//安徽省基线版-蜀山老院
             {