jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c9f5abcb19b2ec754ef0ee17597233a441311a4a

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

sql更改

Showing 1 changed file with 9 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ c9f5abc
... ... @@ -263,9 +263,7 @@
263 263 String hospitalId = autoMatchFacade.getHospitalId(userId);
264 264 PageResult page = findPage(getDoctorInfoSql(startDate, endDate, childBirth, number, name, hospitalId, params), currentPage, pageSize, params);
265 265 List<Map<String, Object>> grid = (List<Map<String, Object>>) page.getGrid();
266   - System.err.println("1>> " + grid);
267 266 setColor(grid);
268   - System.err.println("2>> " + grid);
269 267 rest.setData(page);
270 268 return rest;
271 269 }
... ... @@ -345,7 +343,7 @@
345 343 }
346 344  
347 345 if(StringUtils.isNotBlank(hospitalId)) {
348   - sql.append("AND C.YCY_STSTEM_ID = ? ");
  346 + sql.append("AND C.YCY_STSTEM_ID = ? ");
349 347 params.add(hospitalId);
350 348 }
351 349  
... ... @@ -379,7 +377,8 @@
379 377 .append("B.HIGH_RISK_FACTOR, ")
380 378 .append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN E.CHILDBIRTH_DATE ELSE A.EDD_DATE END), ")
381 379 .append("D.INSERT_DATE, ")
382   - .append("D.DOCTOR_NAME");
  380 + .append("D.DOCTOR_NAME ")
  381 + .append("ORDER BY D.INSERT_DATE DESC");
383 382  
384 383 return sql.toString();
385 384 }
... ... @@ -528,7 +527,7 @@
528 527 .append("INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO ")
529 528 .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC D ON B.EXAMINE_ID=D.EXAMINE_ID AND D.EXAMINE_HISTORY_NUM>1 ")
530 529 .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC E ON B.EXAMINE_ID=E.EXAMINE_ID AND E.EXAMINE_HISTORY_NUM>4 ")
531   - .append("WHERE C.YCY_STSTEM_ID='216' ");
  530 + .append("WHERE 1 = 1 ");
532 531  
533 532 if(childBirth != null) {
534 533 sql.append("AND A.IS_CHILDBIRTH = ? ");
535 534  
... ... @@ -562,9 +561,10 @@
562 561 .append("FROM ODS_F_GRAVIDA_RECORD A ")
563 562 .append("INNER JOIN ODS_F_EXAMINE_HISTORY_ASC B ON A.RECORD_ID=B.RECORD_ID AND A.HOSPITAL_NO=B.HOSPITAL_NO ")
564 563 .append("INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO ")
565   - .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC D ON B.EXAMINE_ID=D.EXAMINE_ID AND D.EXAMINE_HISTORY_NUM>1 ")
566   - .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC E ON B.EXAMINE_ID=E.EXAMINE_ID AND E.EXAMINE_HISTORY_NUM>4 ");
  564 + .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC D ON B.EXAMINE_ID=D.EXAMINE_ID AND D.EXAMINE_HISTORY_NUM=2 ")
  565 + .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC E ON B.EXAMINE_ID=E.EXAMINE_ID AND E.EXAMINE_HISTORY_NUM=5 ");
567 566  
  567 + sql.append("WHERE 1 = 1 ");
568 568 if(childBirth != null) {
569 569 sql.append("AND A.IS_CHILDBIRTH = ? ");
570 570 params.add(childBirth);
... ... @@ -643,7 +643,8 @@
643 643 .append("B.HIGH_RISK_FACTOR, ")
644 644 .append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN E.CHILDBIRTH_DATE ELSE A.EDD_DATE END), ")
645 645 .append("D.INSERT_DATE, ")
646   - .append("D.DOCTOR_NAME ");
  646 + .append("D.DOCTOR_NAME ")
  647 + .append("ORDER BY D.INSERT_DATE DESC ");
647 648 return sql.toString();
648 649 }
649 650 }