jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e6b1ca93dd652db198e6da286481dbbd35c02ebc

Authored by liquanyu
1 parent 2772f4ed82
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 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java View file @ e6b1ca9
... ... @@ -492,9 +492,9 @@
492 492  
493 493 }
494 494 sql+=" ) AA ON C.RECORD_ID=AA.RECORD_ID " +
495   - " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ) A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start;
  495 + " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ORDER BY AA.ISSUE_DATE,C.NAME DESC ) A WHERE ROWNUM <= " + end + " ) WHERE RN >= " + start;
496 496 sqlCount+=" ) AA ON C.RECORD_ID=AA.RECORD_ID " +
497   - " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID";
  497 + " LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ORDER BY AA.ISSUE_DATE,C.NAME DESC";
498 498  
499 499 System.out.println("sql========="+sql);
500 500 System.out.println("sqlCount===="+sql);
... ... @@ -827,7 +827,7 @@
827 827 }
828 828  
829 829 }
830   - sql+=" ) AA ON C.RECORD_ID=AA.RECORD_ID LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID";
  830 + sql+=" ) AA ON C.RECORD_ID=AA.RECORD_ID LEFT JOIN ODS_F_DOMICILE_PLACE D ON C.RECORD_ID=D.RECORD_ID ORDER BY AA.ISSUE_DATE,C.NAME DESC";
831 831  
832 832 System.out.println("sql===="+sql);
833 833 List<Map<String, Object>> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql);
... ... @@ -943,7 +943,7 @@
943 943 result.put("name", map.get("NAME")); //姓名
944 944 result.put("checkWeek", map.get("YZ_NAME")); //产检孕周
945 945 result.put("examineHistoryNum", map.get("EXAMINE_HISTORY_NUM")); //产检第次
946   - result.put("ticketsType",map.get("TICKETS_ORDER")); //产检类型
  946 + result.put("ticketsType",map.get("TICKETS_ORDER")); //产检券类型
947 947 result.put("ticketsNo", map.get("TICKETS_NO")); //产检券号
948 948 result.put("hospitalName",map.get("HOSPITAL_NAME")); //产检机构
949 949 result.put("doctorName",map.get("DOCTOR_NAME")); //产检医生
... ... @@ -958,7 +958,7 @@
958 958 cnames.put("name", "姓名"); //姓名
959 959 cnames.put("checkWeek","产检孕周"); //产检孕周
960 960 cnames.put("examineHistoryNum", "产检第次"); //产检第次
961   - cnames.put("ticketsType","产检类型"); //产检类型
  961 + cnames.put("ticketsType","产检券类型"); //产检券类型
962 962 cnames.put("ticketsNo", "产检券号"); //产检券号
963 963 cnames.put("hospitalName","产检机构"); //产检机构
964 964 cnames.put("doctorName","产检医生"); //产检医生
... ... @@ -1615,7 +1615,7 @@
1615 1615 " CC.DOCTOR_NAME,\n" +
1616 1616 " B.HOSPITAL_NAME AS JD_HOSPITAL,\n" +
1617 1617 " B.TEL_NO\n" +
1618   - " FROM ODS_F_EXAMINE_HISTORY CC\n" +
  1618 + " FROM ODS_F_EXAMINE_HISTORY_ASC CC\n" +
1619 1619 " INNER JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO\n" +
1620 1620 " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID\n" +
1621 1621 " WHERE 1=1 ";