出院登记 获取住院登记信息异常

Business/HisMainBusiness.cs

@@ -798,7 +798,7 @@ namespace PTMedicalInsurance.Business
                 //展示登记面板
                 if (frmReg.ShowDialog() == DialogResult.OK)
                 {
-                    string diseCodg ="",diseName = "";
+                    string diseCodg = frmReg.diseCodg, diseName = frmReg.diseName;
 
                     //兰州要求必须传病种。普通疾病传主诊断
                     if ((frmReg.med_type == "2101") && (frmReg.diseCodg == ""))                    
@@ -1063,8 +1063,8 @@ namespace PTMedicalInsurance.Business
                 frmReg.DtDiagnose = (DataTable)jaConvertedDiagnoses.ToObject(typeof(DataTable));
                 if (frmReg.ShowDialog() == DialogResult.OK)
                 {                    
-                    string diseCodg = "";
-                    string diseName = "";
+                    string diseCodg = frmReg.diseCodg;
+                    string diseName = frmReg.diseName;
 
                     //出院登记入参
                     //单病种出院登记 病种信息取入院登记入参
@@ -1074,9 +1074,6 @@ namespace PTMedicalInsurance.Business
                         {
                             frmReg.insuType = Global.pat.insuType;
                         }
-
-                        diseCodg = Global.pat.DiseasecCode; //取医保平台登记表的病种
-                        diseName = Global.pat.DiseasecName;
                     }
 
                     //兰州要求必须传病种。普通疾病传主诊断
@@ -1090,6 +1087,11 @@ namespace PTMedicalInsurance.Business
                         {
                             diseName = JsonHelper.getDestValue(joHisRtnInfo, "mdtrtinfo.dscg_maindiag_name");
                         };
+                        if (string.IsNullOrEmpty(diseCodg))
+                        {
+                            diseCodg = Global.pat.DiseasecCode;
+                            diseName = Global.pat.discDiagName;
+                        }
                     }
 
                     JObject joDscgInfo = new JObject();

Forms/OutpatientRegistration.cs

@@ -40,10 +40,10 @@ namespace PTMedicalInsurance.Forms
                               + " WHERE B.Code='" + Global.pat.insuType + "' and A.InsuCode = 'insutype'" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxInsuranceType, sqlStr);
 
-                sqlStr = "select A.Code, A.Name FROM HB_MedInsuDirectory A where A.Code='" + Global.pat.DiseasecCode + "' and A.UseFlag='1' And A.HisType=7" + sqlCondition;
+                sqlStr = "select A.Code, A.Name FROM HB_MedInsuDirectory A where A.UseFlag='1' And A.HisType=7" + sqlCondition; //A.Code='" + Global.pat.DiseasecCode + "' and 
                 SetDBLKCombox(ref dblkcbxDisease, sqlStr);
 
-                sqlStr = "select A.Code, A.Name FROM HB_MedInsuDirectory A where A.UseFlag='1' And A.HisType=8" + sqlCondition;
+                sqlStr = "select A.Code, A.Name FROM HB_MedInsuDirectory A where A.UseFlag='1' And A.HisType=5" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxOperation, sqlStr);
 
                 sqlStr = " SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr"
@@ -61,7 +61,7 @@ namespace PTMedicalInsurance.Forms
                 sqlStr = "select A.Code, A.Name FROM HB_MedInsuDirectory A where A.UseFlag='1' And A.HisType=7" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxDisease, sqlStr);
 
-                sqlStr = "select A.Code, A.Name FROM HB_MedInsuDirectory A where A.UseFlag='1' And A.HisType=8" + sqlCondition;
+                sqlStr = "select A.Code, A.Name FROM HB_MedInsuDirectory A where A.UseFlag='1' And A.HisType=5" + sqlCondition;
                 SetDBLKCombox(ref dblkcbxOperation, sqlStr);
 
                 sqlStr = "SELECT B.Code,B.Descripts AS Name FROM HB_Dictionary A JOIN HB_DictionaryDataDetail B ON A.ID = B.HBDictionary_Dr  WHERE A.InsuCode = 'psn_setlway'" + sqlCondition;

InsuBusiness.cs

@@ -317,9 +317,8 @@ namespace PTMedicalInsurance
                                 return rtnResult;
                             }
 
-
                             //显示登记面板
-                            if (hBus.showInPatRegisterForm( out regInParam) == 0)
+                            if (hBus.showInPatRegisterForm(out regInParam) == 0)                            
                             {
                                 JObject joRegIn_plain = JObject.Parse(JsonHelper.setCenterInpar_plain("2401", regInParam));
                                 JObject joRegIn = JObject.Parse(JsonHelper.setCenterInpar("2401", regInParam));
@@ -362,7 +361,7 @@ namespace PTMedicalInsurance
                                         return rtnResult;
                                     }
                                     //插入费用核查表 入院登记
-                                    if (mIS.saveDischargeAudit(3, 2,0, joRegIn, out outParam) != 0)
+                                    if (mIS.saveDischargeAudit(3, 2, 0, joRegIn, out outParam) != 0)                                    
                                     {
                                         rtnResult = JsonHelper.setExceptionJson(-1, "云平台保存费用核查入院登记信息", outParam).ToString();
                                         return rtnResult;