From a48296978be52c093dfe85c18d21cccd5fec912b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 26 Sep 2016 11:20:13 +0800 Subject: [PATCH] code update --- .../platform/common/enums/ServiceStatusEnums.java | 2 +- .../platform/common/enums/ServiceTypeEnums.java | 4 ++-- .../platform/operate/web/facade/PatientFacade.java | 24 ++++++++++++++++++++-- .../operate/web/result/QuanChanResult.java | 22 ++++++++++++++++++++ .../operate/web/result/QuanPatientsResult.java | 12 +++++++++++ .../operate/web/result/RiskPatientsResult.java | 22 ++++++++++++++++++++ 6 files changed, 81 insertions(+), 5 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java index ac3f110..0951d7a 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java @@ -77,7 +77,7 @@ public enum ServiceStatusEnums { public static String getNameById(Integer id) { for(ServiceStatusEnums s : ServiceStatusEnums.values()) { - if (s.getId() == id) + if (id != null && s.getId() == id) { return s.getName(); } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java index 0ca0ce6..056742c 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java @@ -32,9 +32,9 @@ public enum ServiceTypeEnums { public String getName() { return name; } - public static String getTitleById(int id){ + public static String getTitleById(Integer id){ for(ServiceTypeEnums enums:values()){ - if(id==enums.getId()){ + if(id != null && id==enums.getId()){ return enums.getName(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 150e366..7c13a5a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -209,9 +209,21 @@ public class PatientFacade { patientsQuery.sethScoreEnd(riskPatientsQueryRequest.getEndHScore()); patientsQuery.setrFactor(riskPatientsQueryRequest.getrFacotr()); Date currentDate = DateUtil.formatDate(new Date()); - if (null != riskPatientsQueryRequest.getServiceType()) { + + //服务类型 + if (null != riskPatientsQueryRequest.getServiceType() && ServiceTypeEnums.ALL_SERVICE.getId() != Integer.valueOf(riskPatientsQueryRequest.getServiceType())) { patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType())); } + + //服务状态 + if (null != riskPatientsQueryRequest.getServiceStatus()) { + if (ServiceStatusEnums.STANDARD_ALL.getId() != Integer.valueOf(riskPatientsQueryRequest.getServiceStatus()) && ServiceStatusEnums.ADD_ALL.getId() != Integer.valueOf(riskPatientsQueryRequest.getServiceStatus())) + { + patientsQuery.setServiceStatus(Integer.valueOf(riskPatientsQueryRequest.getServiceStatus())); + } + + } + patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel()); patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd()); patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart()); @@ -259,7 +271,6 @@ public class PatientFacade { patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); patientsQuery.setPage(riskPatientsQueryRequest.getPage()); patientsQuery.setIsHighRisk(isHighRisk); - patientsQuery.setServiceStatus(riskPatientsQueryRequest.getServiceStatus()); patientsQuery.setYn(YnEnums.YES.getId()); // patientsQuery.setBuildType(1); //0 未分娩建档 2 自动分娩类型 http://jira.healthbaby.com.cn/browse/WEB-639 @@ -382,6 +393,9 @@ public class PatientFacade { } } } + + chanResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType())); + chanResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus())); chanResult.setNextCheckTime(nextCheckTime); data.add(chanResult); } @@ -470,6 +484,9 @@ public class PatientFacade { } } } + + quanPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType())); + quanPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus())); HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); quanPatientsResult.setcTime(nextCheckTime); quanPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel())); @@ -553,6 +570,9 @@ public class PatientFacade { } } + + riskPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType())); + riskPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus())); riskPatientsResult.setcTime(nextCheckTime); riskPatientsResult.setrFactor(highScoreResult.gethighRiskStr()); riskPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java index d0a0a03..a01a4be 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java @@ -40,6 +40,28 @@ public class QuanChanResult implements IBasicResultConvert