jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2a632073c1e92576438564981b44f929aaae3006

Authored by liquanyu
1 parent 063e677a89
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 6 additions and 7 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 2a63207
... ... @@ -361,9 +361,9 @@
361 361 sql.append("SELECT A.NAME, ")
362 362 .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, ")
363 363 .append("SUM((CASE WHEN A.HOSPITAL_NO=B.HOSPITAL_NO THEN 1 ELSE 0 END)) AS BENYUAN_NUM, ")
364   - .append("F.EXAMINE_HISTORY_NUM AS TOTAL_NUM, ")
365   - .append("B.HIGH_RISK_GRADE, ")
366   - .append("B.HIGH_RISK_FACTOR, ")
  364 + .append("MAX(B.EXAMINE_HISTORY_NUM AS) TOTAL_NUM, ")
  365 + .append("D.HIGH_RISK_GRADE, ")
  366 + .append("D.HIGH_RISK_FACTOR, ")
367 367 .append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN E.CHILDBIRTH_DATE ELSE A.EDD_DATE END) AS EDD_DATE, ")
368 368 .append("D.INSERT_DATE AS LAST_EXAMINE_DATE, ")
369 369 .append("D.DOCTOR_NAME ")
... ... @@ -372,7 +372,6 @@
372 372 .append("INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO ")
373 373 .append("LEFT JOIN ODS_F_EXAMINE_HISTORY D ON A.RECORD_ID=D.RECORD_ID AND D.EXAMINE_HISTORY_NUM=1 ")
374 374 .append("LEFT JOIN ODS_F_CHILDBIRTH E ON A.RECORD_ID=E.RECORD_ID ")
375   - .append("INNER JOIN ODS_F_EXAMINE_HISTORY_ASC F ON D.EXAMINE_ID=F.EXAMINE_ID ")
376 375 .append("WHERE 1 = 1 AND A.CREATE_TYPE_ID <> 2 ");
377 376  
378 377 if(childBirth != null) {
... ... @@ -410,9 +409,9 @@
410 409 sql.append("GROUP BY A.RECORD_ID, ")
411 410 .append("A.NAME, ")
412 411 .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), ")
413   - .append("F.EXAMINE_HISTORY_NUM, ")
414   - .append("B.HIGH_RISK_GRADE, ")
415   - .append("B.HIGH_RISK_FACTOR, ")
  412 +
  413 + .append("D.HIGH_RISK_GRADE, ")
  414 + .append("D.HIGH_RISK_FACTOR, ")
416 415 .append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN E.CHILDBIRTH_DATE ELSE A.EDD_DATE END), ")
417 416 .append("D.INSERT_DATE, ")
418 417 .append("D.DOCTOR_NAME ")