liquanyu / regional-platform

Download as
Browse Code »

Commit 147e2620051546b09df720ccb2d89223b013363c

Authored by jiangjiazhi
1 parent 2d0ab16493
Exists in master and in 1 other branch dev

分娩作废产检劵

Showing 1 changed file with 13 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java View file @ 147e262
... ... @@ -526,22 +526,22 @@
526 526 "A.CHILD_CATEGORY_ID," +
527 527 "A.CHILD_CATEGORY," +
528 528 "(CASE WHEN A.BIRTH_HOSPITAL_NO=A.HOSPITAL_NO THEN '本院分娩'" +
529   - "WHEN A.BIRTH_HOSPITAL_NO<>A.HOSPITAL_NO AND A.BIRTH_HOSPITAL_NO IS NOT NULL THEN '外院分娩'" +
530   - "WHEN A.BIRTH_HOSPITAL_NO IS NULL THEN '未知'" +
  529 + " WHEN A.BIRTH_HOSPITAL_NO<>A.HOSPITAL_NO AND A.BIRTH_HOSPITAL_NO IS NOT NULL THEN '外院分娩'" +
  530 + " WHEN A.BIRTH_HOSPITAL_NO IS NULL THEN '未知'" +
531 531 "END) AS LB_NAME," +
532 532 "COUNT(*) AS CNT" +
533   - "FROM ODS_F_INFANT_RECORD A" +
534   - "INNER JOIN ODS_D_HOSPITAL B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
  533 + " FROM ODS_F_INFANT_RECORD A" +
  534 + " INNER JOIN ODS_D_HOSPITAL B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
535 535 // 医院，判断本院外院使用
536   - "WHERE B.YCY_STSTEM_ID=" + hospitalId;
  536 + " WHERE B.YCY_STSTEM_ID=" + hospitalId;
537 537 // 这三个查询条件暂时没用，直接注释掉
538 538 // "AND B.PROVINCE_ID=" +
539 539 // "AND B.CITY_ID=" +
540 540 // "AND B.AREA_COUNTY_ID="
541 541 if (StringUtils.isNotEmpty(babyStatisticsManagerBuildSourceListRequest.getBuildDate())) {
542   - sql += "AND A.INSERT_DATE BETWEEN" + buildDateStart + "AND" + buildDateEnd;
  542 + sql += " AND A.INSERT_DATE BETWEEN" + buildDateStart + "AND" + buildDateEnd;
543 543 }
544   - sql += "GROUP BY" +
  544 + sql += " GROUP BY" +
545 545 "B.PROVINCE_ID," +
546 546 "B.PROVINCE," +
547 547 "B.CITY_ID," +
... ... @@ -664,11 +664,11 @@
664 664 "B.HOSPITAL_NAME," +
665 665 "TRUNC(MONTHS_BETWEEN(C.EXAMINE_DATE,A.BIRTHDAY)) AS EXAMINE_MONTH," +
666 666 "COUNT(*) AS CNT" +
667   - "FROM ODS_F_INFANT_RECORD A" +
668   - "INNER JOIN ODS_D_HOSPITAL B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
669   - "LEFT JOIN ODS_F_CHILD_PHYSICAL C ON A.RECORD_ID=C.RECORD_ID AND C.EXAMINE_HISTORY_NUM=1" +
670   - "WHERE A.HOSPITAL_NO=A.BIRTH_HOSPITAL_NO" +
671   - "AND B.YCY_STSTEM_ID='" + hospitalId+"'";
  667 + " FROM ODS_F_INFANT_RECORD A" +
  668 + " INNER JOIN ODS_D_HOSPITAL B ON A.HOSPITAL_NO=B.HOSPITAL_NO" +
  669 + " LEFT JOIN ODS_F_CHILD_PHYSICAL C ON A.RECORD_ID=C.RECORD_ID AND C.EXAMINE_HISTORY_NUM=1" +
  670 + " WHERE A.HOSPITAL_NO=A.BIRTH_HOSPITAL_NO" +
  671 + " AND B.YCY_STSTEM_ID='" + hospitalId+"'";
672 672 // 这三个查询条件暂时没用，直接注释掉
673 673 // "AND B.PROVINCE_ID="+
674 674 // "AND B.CITY_ID="+
... ... @@ -676,7 +676,7 @@
676 676 if (StringUtils.isNotEmpty(babyStatisticsManagerSelfConversionListRequest.getBirthDate())) {
677 677 sql += " AND A.INSERT_DATE BETWEEN TO_DATE('" + birthDateStart + "','YYYY-MM-DD') AND TO_DATE('" + birthDateEnd+"','YYYY-MM-DD')";
678 678 }
679   - sql += "GROUP BY" +
  679 + sql += " GROUP BY " +
680 680 "B.PROVINCE_ID," +
681 681 "B.PROVINCE," +
682 682 "B.CITY_ID," +