违规收费分析显示出院诊断

src/main/java/thyyxxk/webserver/dao/his/reports/IllegalChargesAnalysisDao.java

@@ -46,9 +46,8 @@ public interface IllegalChargesAnalysisDao {
             "zy_inactpatient.admiss_times=a.admiss_times))), " +
             "deptName=(select rtrim(name) from zd_unit_code where code=a.ward_code), " +
             "wardName=(select rtrim(name) from zd_unit_code where code=a.dept_code), " +
-            "diag=rtrim(isnull((select admiss_diag_str from zy_actpatient where zy_actpatient.inpatient_no=a.inpatient_no), " +
-            "(select admiss_diag_str from zy_inactpatient where zy_inactpatient.inpatient_no=a.inpatient_no and " +
-            "zy_inactpatient.admiss_times=a.admiss_times))), " +
+            "diag=(select rtrim(dis_diag_comment) from zy_dis_diag_yb where inpatient_no=a.inpatient_no and " +
+            "admiss_times=a.admiss_times and dis_diag_no=1), " +
             "detail_sn,charge_date, " +
             "rtrim(charge_code_mx) as chargeCode, " +
             "chargeName=rtrim(isnull((select name from zd_charge_item where code=charge_code_mx)," +