Commit 74d188690d1b843723fbbb31cb1ec6135df45f69
1 parent
7f7159ce41
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 4 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
74d1886
| ... | ... | @@ -521,7 +521,7 @@ |
| 521 | 521 | .append("ODS_F_EXAMINE_HISTORY_ASC B, ") |
| 522 | 522 | .append("ODS_D_HOSPITAL C, ") |
| 523 | 523 | .append("ODS_F_EXAMINE_HISTORY D ") |
| 524 | - .append("WHERE A.RECORD_ID=B.RECORD_ID ") | |
| 524 | + .append("WHERE A.RECORD_ID=B.RECORD_ID AND A.CREATE_TYPE_ID <> 2 ") | |
| 525 | 525 | .append("AND A.HOSPITAL_NO=C.HOSPITAL_NO ") |
| 526 | 526 | .append("AND A.HOSPITAL_NO=B.HOSPITAL_NO ") |
| 527 | 527 | .append("AND B.EXAMINE_ID=D.EXAMINE_ID ") |
| ... | ... | @@ -635,9 +635,9 @@ |
| 635 | 635 | sql.append("SELECT A.NAME, ") |
| 636 | 636 | .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, ") |
| 637 | 637 | .append("G.BENYUAN_NUM, ") |
| 638 | - .append("F.EXAMINE_HISTORY_NUM AS TOTAL_NUM, ") | |
| 639 | - .append("B.HIGH_RISK_GRADE, ") | |
| 640 | - .append("B.HIGH_RISK_FACTOR, ") | |
| 638 | + .append("B.EXAMINE_HISTORY_NUM AS TOTAL_NUM, ") | |
| 639 | + .append("D.HIGH_RISK_GRADE, ") | |
| 640 | + .append("D.HIGH_RISK_FACTOR, ") | |
| 641 | 641 | .append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN E.CHILDBIRTH_DATE ELSE A.EDD_DATE END) AS EDD_DATE, ") |
| 642 | 642 | .append("D.INSERT_DATE AS LAST_EXAMINE_DATE, ") |
| 643 | 643 | .append("D.DOCTOR_NAME ") |