From 51cac3b76d48f5a813cf91f4a9259335b1ffbd14 Mon Sep 17 00:00:00 2001 From: litao Date: Thu, 20 Apr 2017 22:35:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=8C=BB=E7=94=9F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/ReportController.java | 36 +++++-- .../operate/web/service/IReportService.java | 22 ++++ .../web/service/impl/ReportServiceImpl.java | 118 ++++++++++++++++++++- 3 files changed, 164 insertions(+), 12 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java index ed01479..7b52510 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java @@ -39,15 +39,35 @@ public class ReportController extends BaseController { return reportService.areaCountFacade(startDate, endDate, startWeek, endWeek, childBirth); } - @RequestMapping(method = RequestMethod.GET,value = "/date") + /** + * 孕产妇明细查看 + * @param startDate 建档开始时间 + * @param endDate 建档结束时间 + * @param startWeek 孕周开始时间 + * @param endWeek 孕周结束时间 + * @param childBirth 统计范围 1=孕妇 3=产妇 不传=全部 + * @param number 检查次数 + * @param name 医生名称 + * @return + */ + @RequestMapping(method = RequestMethod.GET,value = "/checkInfo") + @ResponseBody + public BaseObjectResponse checkInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name) { + return reportService.checkInfo(childBirth, startDate, endDate, startWeek, endWeek, number, name); + } + + /** + * 产检医生统计 + * @param startDate 建档开始时间 + * @param endDate 建档结束时间 + * @param childBirth 统计范围 1=孕妇 3=产妇 不传=全部 + * @return + */ + @RequestMapping(method = RequestMethod.GET,value = "/doctor") @ResponseBody - public BaseObjectResponse testDate(Date startDate) { - if(startDate != null) { - System.out.println("startDate = [" + startDate.toLocaleString() + "]"); - } - BaseObjectResponse obj = new BaseObjectResponse(); - obj.setData(startDate); - return obj; + public BaseObjectResponse doctorMedical(String startDate, String endDate, Integer childBirth) { + return reportService.doctorMedical + (startDate, endDate, childBirth); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java index 23264c3..b0c63c9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java @@ -20,4 +20,26 @@ public interface IReportService { * @return */ BaseObjectResponse areaCountFacade(String startDate, String endDate, Integer startWeek, Integer endWeek, Integer childBirth); + + /** + * 产检医生统计 + * @param startDate + * @param endDate + * @param childBirth + * @return + */ + BaseObjectResponse doctorMedical(String startDate, String endDate, Integer childBirth); + + /** + * 孕产妇明细查看 + * @param childBirth + * @param startDate + * @param endDate + * @param startWeek + * @param endWeek + * @param number + * @param name + * @return + */ + BaseObjectResponse checkInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name); } 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 22da762..83aa75e 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 @@ -7,7 +7,6 @@ import com.lyms.platform.operate.web.utils.MathUtil; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import scala.collection.mutable.StringBuilder; import java.util.*; @@ -38,11 +37,58 @@ public class ReportServiceImpl implements IReportService { return rest; } + @Override + public BaseObjectResponse doctorMedical(String startDate, String endDate, Integer childBirth) { + BaseObjectResponse rest = new BaseObjectResponse(); + Map restMap = new HashMap<>(); + List params = new ArrayList<>(); + List> restList = reportDao.findList(getDoctorMedicalSql(startDate, endDate, childBirth, params), params); + return null; + } + + @Override + public BaseObjectResponse checkInfo(Integer childBirth, String startDate, String endDate, Integer startWeek, Integer endWeek, Integer number, String name) { + return null; + } + + private Map createGrid(List peopleList, List proportionList) { Map map = new HashMap<>(); - map.put("peoples", peopleList); - map.put("proportion", proportionList); - map.put("header", Arrays.asList("产检次数", "总计", "1次", "2次", "3次", "4次", "5次", "6次", "7次", "8次", "9次", "10次", "11次", "12次", "≥13次")); + Map peoples = new HashMap<>(); + peoples.put("desc", peopleList.get(0)); /** 产检人数 */ + peoples.put("count", peopleList.get(1));/** 总计 */ + peoples.put("once", peopleList.get(2)); + peoples.put("twice", peopleList.get(3)); + peoples.put("threeTimes", peopleList.get(4)); + peoples.put("fourTimes", peopleList.get(5)); + peoples.put("fiveTimes", peopleList.get(6)); + peoples.put("sixTimes", peopleList.get(7)); + peoples.put("sevenTimes", peopleList.get(8)); + peoples.put("eightTimes", peopleList.get(9)); + peoples.put("nineTimes", peopleList.get(10)); + peoples.put("tenTimes", peopleList.get(11)); + peoples.put("elevenTimes", peopleList.get(12)); + peoples.put("twelveTimes", peopleList.get(13)); +// map.put("peoples", peopleList); + map.put("peoples", peoples); + + Map proportion = new HashMap<>(); + proportion.put("desc", proportionList.get(0)); /** 占比 */ + proportion.put("count", proportionList.get(1));/** 总计 */ + proportion.put("once", proportionList.get(2)); + proportion.put("twice", proportionList.get(3)); + proportion.put("threeTimes", proportionList.get(4)); + proportion.put("fourTimes", proportionList.get(5)); + proportion.put("fiveTimes", proportionList.get(6)); + proportion.put("sixTimes", proportionList.get(7)); + proportion.put("sevenTimes", proportionList.get(8)); + proportion.put("eightTimes", proportionList.get(9)); + proportion.put("nineTimes", proportionList.get(10)); + proportion.put("tenTimes", proportionList.get(11)); + proportion.put("elevenTimes", proportionList.get(12)); + proportion.put("twelveTimes", proportionList.get(13)); +// map.put("proportion", proportionList); + map.put("proportion", proportion); return map; } @@ -128,6 +174,70 @@ public class ReportServiceImpl implements IReportService { return sql.toString(); } + private String getDoctorMedicalSql(String startDate, String endDate, Integer childBirth, List params) { + StringBuilder sql = new StringBuilder(); + sql.append("SELECT B.DOCTOR_NAME, ") + .append("COUNT(B.EXAMINE_ID) AS CJ_RC, ") + .append("COUNT(DISTINCT A.RECORD_ID) AS CJ_RS, ") + .append("COUNT(DISTINCT D.RECORD_ID) AS LIANGCI_RS, ") + .append("COUNT(DISTINCT E.RECORD_ID) AS WUCI_RS ") + .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("WHERE C.YCY_STSTEM_ID='216' "); + + if(childBirth != null) { + sql.append("AND A.IS_CHILDBIRTH = ? "); + params.add(childBirth); + } + + if(startDate != null && endDate != null) { + sql.append("AND A.CREATE_DATE BETWEEN to_date(?,'yyyy-mm-dd') AND to_date(?,'yyyy-mm-dd') "); + params.add(startDate); + params.add(endDate); + } + + /* if(startWeek != null && endWeek != null) { + sql.append("AND A.NOW_WEEKS BETWEEN ? AND ? "); + params.add(startWeek); + params.add(endWeek); + }*/ + + + sql.append("GROUP BY B.DOCTOR_NAME,B.DOCTOR_NO ") + .append("UNION ALL ") + .append("SELECT '总计', ") + .append("COUNT(B.EXAMINE_ID) AS CJ_RC, ") + .append("COUNT(DISTINCT A.RECORD_ID) AS CJ_RS, ") + .append("COUNT(DISTINCT D.RECORD_ID) AS LIANGCI_RS, ") + .append("COUNT(DISTINCT E.RECORD_ID) AS WUCI_RS ") + .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 "); + + if(childBirth != null) { + sql.append("AND A.IS_CHILDBIRTH = ? "); + params.add(childBirth); + } + + if(startDate != null && endDate != null) { + sql.append("AND A.CREATE_DATE BETWEEN to_date(?,'yyyy-mm-dd') AND to_date(?,'yyyy-mm-dd') "); + params.add(startDate); + params.add(endDate); + } + + /*if(startWeek != null && endWeek != null) { + sql.append("AND A.NOW_WEEKS BETWEEN ? AND ? "); + params.add(startWeek); + params.add(endWeek); + }*/ + return sql.toString(); + } + public static void main(String[] args) { System.out.println("1".equals("" + 1)); System.out.println(StringUtils.isNotBlank("")); -- 1.8.3.1