diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 5be3715..66e567d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -521,7 +521,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .append("ODS_F_EXAMINE_HISTORY_ASC B, ") .append("ODS_D_HOSPITAL C, ") .append("ODS_F_EXAMINE_HISTORY D ") - .append("WHERE A.RECORD_ID=B.RECORD_ID ") + .append("WHERE A.RECORD_ID=B.RECORD_ID AND A.CREATE_TYPE_ID <> 2 ") .append("AND A.HOSPITAL_NO=C.HOSPITAL_NO ") .append("AND A.HOSPITAL_NO=B.HOSPITAL_NO ") .append("AND B.EXAMINE_ID=D.EXAMINE_ID ") @@ -635,9 +635,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService sql.append("SELECT A.NAME, ") .append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN '已分娩' ELSE (CASE WHEN A.NOW_WEEKS_DAY<>0 THEN '孕'||A.NOW_WEEKS||'周+'||A.NOW_WEEKS_DAY||'天' ELSE '孕'||A.NOW_WEEKS||'周' END) END) AS YUNZHOU, ") .append("G.BENYUAN_NUM, ") - .append("F.EXAMINE_HISTORY_NUM AS TOTAL_NUM, ") - .append("B.HIGH_RISK_GRADE, ") - .append("B.HIGH_RISK_FACTOR, ") + .append("B.EXAMINE_HISTORY_NUM AS TOTAL_NUM, ") + .append("D.HIGH_RISK_GRADE, ") + .append("D.HIGH_RISK_FACTOR, ") .append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN E.CHILDBIRTH_DATE ELSE A.EDD_DATE END) AS EDD_DATE, ") .append("D.INSERT_DATE AS LAST_EXAMINE_DATE, ") .append("D.DOCTOR_NAME ")