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 ffdc377..ca49312 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 @@ -596,7 +596,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService StringBuilder sql = new StringBuilder(); 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("SUM((CASE WHEN A.HOSPITAL_NO=B.HOSPITAL_NO THEN 1 ELSE 0 END)) AS BENYUAN_NUM, ") + .append("G.BENYUAN_NUM, ") .append("F.EXAMINE_HISTORY_NUM AS TOTAL_NUM, ") .append("B.HIGH_RISK_GRADE, ") .append("B.HIGH_RISK_FACTOR, ") @@ -605,8 +605,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .append("D.DOCTOR_NAME ") .append("FROM ODS_F_GRAVIDA_RECORD A ") .append("INNER JOIN ODS_F_EXAMINE_HISTORY_ASC B ON A.RECORD_ID=B.RECORD_ID ") + .append("INNER JOIN ODS_F_EXAMINE_HISTORY_BENYUAN G ON A.RECORD_ID=G.RECORD_ID ") .append("INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO ") - .append("LEFT JOIN ODS_F_EXAMINE_HISTORY D ON A.RECORD_ID=D.RECORD_ID AND D.EXAMINE_HISTORY_NUM=1 ") + .append("LEFT JOIN ODS_F_EXAMINE_HISTORY D ON A.RECORD_ID=D.RECORD_ID AND D.EXAMINE_HISTORY_NUM=1 AND B.EXAMINE_ID=D.EXAMINE_ID ") .append("LEFT JOIN ODS_F_CHILDBIRTH E ON A.RECORD_ID=E.RECORD_ID ") .append("INNER JOIN ODS_F_EXAMINE_HISTORY_ASC F ON D.EXAMINE_ID=F.EXAMINE_ID ") .append("WHERE 1=1 "); @@ -638,16 +639,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService params.add(number); } - sql.append("GROUP BY A.RECORD_ID, ") - .append("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), ") - .append("F.EXAMINE_HISTORY_NUM, ") - .append("B.HIGH_RISK_GRADE, ") - .append("B.HIGH_RISK_FACTOR, ") - .append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN E.CHILDBIRTH_DATE ELSE A.EDD_DATE END), ") - .append("D.INSERT_DATE, ") - .append("D.DOCTOR_NAME ") - .append("ORDER BY D.INSERT_DATE DESC "); return sql.toString(); } }