From c9f5abcb19b2ec754ef0ee17597233a441311a4a Mon Sep 17 00:00:00 2001 From: litao Date: Tue, 25 Apr 2017 14:27:40 +0800 Subject: [PATCH] =?UTF-8?q?sql=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/service/impl/ReportServiceImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index a4de70e..bbb55e1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -263,9 +263,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService String hospitalId = autoMatchFacade.getHospitalId(userId); PageResult page = findPage(getDoctorInfoSql(startDate, endDate, childBirth, number, name, hospitalId, params), currentPage, pageSize, params); List> grid = (List>) page.getGrid(); - System.err.println("1>> " + grid); setColor(grid); - System.err.println("2>> " + grid); rest.setData(page); return rest; } @@ -345,7 +343,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } if(StringUtils.isNotBlank(hospitalId)) { - sql.append("AND C.YCY_STSTEM_ID = ? "); + sql.append("AND C.YCY_STSTEM_ID = ? "); params.add(hospitalId); } @@ -379,7 +377,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .append("B.HIGH_RISK_FACTOR, ") .append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN E.CHILDBIRTH_DATE ELSE A.EDD_DATE END), ") .append("D.INSERT_DATE, ") - .append("D.DOCTOR_NAME"); + .append("D.DOCTOR_NAME ") + .append("ORDER BY D.INSERT_DATE DESC"); return sql.toString(); } @@ -528,7 +527,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .append("INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO ") .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC D ON B.EXAMINE_ID=D.EXAMINE_ID AND D.EXAMINE_HISTORY_NUM>1 ") .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC E ON B.EXAMINE_ID=E.EXAMINE_ID AND E.EXAMINE_HISTORY_NUM>4 ") - .append("WHERE C.YCY_STSTEM_ID='216' "); + .append("WHERE 1 = 1 "); if(childBirth != null) { sql.append("AND A.IS_CHILDBIRTH = ? "); @@ -562,9 +561,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .append("FROM ODS_F_GRAVIDA_RECORD A ") .append("INNER JOIN ODS_F_EXAMINE_HISTORY_ASC B ON A.RECORD_ID=B.RECORD_ID AND A.HOSPITAL_NO=B.HOSPITAL_NO ") .append("INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO ") - .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC D ON B.EXAMINE_ID=D.EXAMINE_ID AND D.EXAMINE_HISTORY_NUM>1 ") - .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC E ON B.EXAMINE_ID=E.EXAMINE_ID AND E.EXAMINE_HISTORY_NUM>4 "); + .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC D ON B.EXAMINE_ID=D.EXAMINE_ID AND D.EXAMINE_HISTORY_NUM=2 ") + .append("LEFT JOIN ODS_F_EXAMINE_HISTORY_ASC E ON B.EXAMINE_ID=E.EXAMINE_ID AND E.EXAMINE_HISTORY_NUM=5 "); + sql.append("WHERE 1 = 1 "); if(childBirth != null) { sql.append("AND A.IS_CHILDBIRTH = ? "); params.add(childBirth); @@ -643,7 +643,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .append("B.HIGH_RISK_FACTOR, ") .append("(CASE WHEN A.IS_CHILDBIRTH=3 THEN E.CHILDBIRTH_DATE ELSE A.EDD_DATE END), ") .append("D.INSERT_DATE, ") - .append("D.DOCTOR_NAME "); + .append("D.DOCTOR_NAME ") + .append("ORDER BY D.INSERT_DATE DESC "); return sql.toString(); } } -- 1.8.3.1