jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ebfd0dc4d9bb18e388504d854ae64756b8800244

Authored by litao
1 parent 7cb56d8b43
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

sql更改

Showing 1 changed file with 3 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ ebfd0dc
... ... @@ -596,7 +596,7 @@
596 596 StringBuilder sql = new StringBuilder();
597 597 sql.append("SELECT A.NAME, ")
598 598 .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, ")
599   - .append("SUM((CASE WHEN A.HOSPITAL_NO=B.HOSPITAL_NO THEN 1 ELSE 0 END)) AS BENYUAN_NUM, ")
  599 + .append("G.BENYUAN_NUM, ")
600 600 .append("F.EXAMINE_HISTORY_NUM AS TOTAL_NUM, ")
601 601 .append("B.HIGH_RISK_GRADE, ")
602 602 .append("B.HIGH_RISK_FACTOR, ")
603 603  
... ... @@ -605,8 +605,9 @@
605 605 .append("D.DOCTOR_NAME ")
606 606 .append("FROM ODS_F_GRAVIDA_RECORD A ")
607 607 .append("INNER JOIN ODS_F_EXAMINE_HISTORY_ASC B ON A.RECORD_ID=B.RECORD_ID ")
  608 + .append("INNER JOIN ODS_F_EXAMINE_HISTORY_BENYUAN G ON A.RECORD_ID=G.RECORD_ID ")
608 609 .append("INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO ")
609   - .append("LEFT JOIN ODS_F_EXAMINE_HISTORY D ON A.RECORD_ID=D.RECORD_ID AND D.EXAMINE_HISTORY_NUM=1 ")
  610 + .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 ")
610 611 .append("LEFT JOIN ODS_F_CHILDBIRTH E ON A.RECORD_ID=E.RECORD_ID ")
611 612 .append("INNER JOIN ODS_F_EXAMINE_HISTORY_ASC F ON D.EXAMINE_ID=F.EXAMINE_ID ")
612 613 .append("WHERE 1=1 ");
... ... @@ -638,16 +639,6 @@
638 639 params.add(number);
639 640 }
640 641  
641   - sql.append("GROUP BY A.RECORD_ID, ")
642   - .append("A.NAME, ")
643   - .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), ")
644   - .append("F.EXAMINE_HISTORY_NUM, ")
645   - .append("B.HIGH_RISK_GRADE, ")
646   - .append("B.HIGH_RISK_FACTOR, ")
647   - .append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN E.CHILDBIRTH_DATE ELSE A.EDD_DATE END), ")
648   - .append("D.INSERT_DATE, ")
649   - .append("D.DOCTOR_NAME ")
650   - .append("ORDER BY D.INSERT_DATE DESC ");
651 642 return sql.toString();
652 643 }
653 644 }