代码更新

Forms/MedInsuQuery.cs

@@ -61,15 +61,15 @@ namespace PTMedicalInsurance.Forms
                             + " AdmBed,RegDate,MainDiagName,AttendDoctorNO,ChiefPhyDocName,'"+ sCZYXM+ "' as OpertName,'' as InHospNo,''Address ";                           
 
             string SqlStrMain = " SELECT a.*,b.*,a.PatientName AS Name,a.PsnType AS PsnTypeCode,'在院' sZYZT FROM BS_MIPatCurrentInsuInfo a LEFT JOIN BS_MedInsuRegisterInfo b "
-                              + " ON a.MdtrtID=b.InsuRegID AND a.Interface_Dr=b.Interface_Dr  " //AND a.Hospital_Dr=b.Hospital_Dr
+                              + " ON a.MdtrtID=b.InsuRegID AND a.Interface_Dr=b.Interface_Dr AND a.Hospital_Dr=b.Hospital_Dr AND a.AdmID=b.Adm_Dr  " //AND a.Hospital_Dr=b.Hospital_Dr
                               + " WHERE b.Type=1 AND b.ValidFlag=1 AND b.Hospital_Dr= " + Global.inf.hospitalDr + " AND b.Interface_Dr= " + Global.inf.interfaceDr
-                              + " AND b.InsuRegID NOT IN (SELECT MdtrtID FROM BS_MedInsuSettlement WHERE MdtrtID=b.InsuRegID AND BillType=1 AND ValidFlag=1 AND AdmType=2) "
+                              + " AND b.InsuRegID NOT IN (SELECT MdtrtID FROM BS_MedInsuSettlement WHERE MdtrtID=b.InsuRegID AND BillType=1 AND ValidFlag=1 AND AdmType=2 AND Interface_Dr= " + Global.inf.interfaceDr+") "
                               + " AND b.RegDate<='" + dpED.Text + "' AND b.RegDate>'" + dpST.Text + "' "  //
                               + " UNION ALL "
                               + " SELECT a.*,b.*,a.PatientName AS Name,a.PsnType AS PsnTypeCode,'已结算' AS sZYZT "
                               + " FROM BS_MIPatCurrentInsuInfo a LEFT JOIN BS_MedInsuRegisterInfo b "
-                              + " ON a.MdtrtID=b.InsuRegID AND a.Interface_Dr=b.Interface_Dr  " //AND a.Hospital_Dr=b.Hospital_Dr
-                              + " LEFT JOIN BS_MedInsuSettlement c ON b.InsuRegID=c.MdtrtID AND b.Interface_Dr=c.Interface_Dr " //AND a.MdtrtID=b.InsuRegID AND a.Interface_Dr=b.Interface_Dr
+                              + " ON a.MdtrtID=b.InsuRegID AND a.Interface_Dr=b.Interface_Dr AND a.Hospital_Dr=b.Hospital_Dr AND a.AdmID=b.Adm_Dr " //AND a.Hospital_Dr=b.Hospital_Dr
+                              + " LEFT JOIN BS_MedInsuSettlement c ON b.InsuRegID=c.MdtrtID AND b.Interface_Dr=c.Interface_Dr AND b.Hospital_Dr=c.Hospital_Dr AND b.Adm_Dr=c.Adm_Dr " //AND a.MdtrtID=b.InsuRegID AND a.Interface_Dr=b.Interface_Dr
                               + " WHERE b.Type=1 AND b.ValidFlag=1 AND c.BillType=1 AND b.Hospital_Dr= " + Global.inf.hospitalDr + " AND b.Interface_Dr= " + Global.inf.interfaceDr                    
                               + " AND c.AdmType=2 AND c.SettlementDateTime<='" + dpED.Text + "' AND c.SettlementDateTime>'" + dpST.Text + "' ";  //