From f9eda7cc0661bff34522c3a2a4d0a061ca9834f3 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 2 Aug 2016 15:14:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 127 +++++++++++++++------ .../platform/operate/web/facade/PatientFacade.java | 34 +++--- .../operate/web/facade/PostReviewFacade.java | 2 +- .../operate/web/result/HighScoreResult.java | 27 +++++ 4 files changed, 131 insertions(+), 59 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 36cad14..6c69bf4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -10,14 +10,12 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.*; -import com.lyms.platform.operate.web.result.AntData; -import com.lyms.platform.operate.web.result.AntenatalExaminationResult; -import com.lyms.platform.operate.web.result.AntexChuResult; -import com.lyms.platform.operate.web.result.AntexListResult; +import com.lyms.platform.operate.web.result.*; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; +import com.sun.javafx.collections.MappingChange; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -149,35 +147,66 @@ public class AntenatalExaminationFacade { * * @return */ - public List findLastRisk(String parentId) { + public HighScoreResult findLastRisk(String parentId) { List list = antenatalExaminationService.findAllByParentId(parentId); + List result = new ArrayList(); AntenatalExaminationModel model = null; if (CollectionUtils.isNotEmpty(list)) { model = list.get(0); } + HighScoreResult highScoreResult = new HighScoreResult(); try { - if (null != model && StringUtils.isNotEmpty(model.getRiskFactor())) { + //复诊 + if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"{}".equals(model.getRiskFactor())) { List list1 = JsonUtil.toList(model.getRiskFactor(), List.class); - return queryRisk(list1); + highScoreResult = queryRisk(list1); + result.addAll(highScoreResult.getHighRisk()); } - } catch (Exception e) { - } - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setParentId(parentId); - antExChuQuery.setYn(YnEnums.YES.getId()); - List list1 = antenatalExaminationService.queryAntExChu(antExChuQuery); - AntExChuModel antExChuModel = null; - if (CollectionUtils.isNotEmpty(list1)) { - antExChuModel = list1.get(0); - } - try { - if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { + if (null != model &&!"{}".equals(model.getOtherRisk())) { + Map map = JsonUtil.str2Obj(model.getOtherRisk(), Map.class); + + //风险因素 + Map map1 = new HashMap(); + map1.put("id", ""); + map1.put("name", map.get("fxysu")); + result.add(map1); + //风险评分 + Object idObj = map.get("fxpf"); + if (null != idObj) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); + highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0)); + } + } + //初诊 + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setParentId(parentId); + antExChuQuery.setYn(YnEnums.YES.getId()); + List list1 = antenatalExaminationService.queryAntExChu(antExChuQuery); + AntExChuModel antExChuModel = null; + if (CollectionUtils.isNotEmpty(list1)) { + antExChuModel = list1.get(0); + } + if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"{}".equals(antExChuModel.getHighrisk())) { List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); - return queryRisk(list2); + highScoreResult = queryRisk(list2); + } + if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk())) { + Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class); + //风险因素 + Map map1 = new HashMap(); + map1.put("id", ""); + map1.put("name", map.get("fxysu")); + result.add(map1); + //风险评分 + Object idObj = map.get("fxpf"); + if (null != idObj) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); + highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0)); + } } } catch (Exception e) { } - return Collections.emptyList(); + return highScoreResult; } /** @@ -387,7 +416,7 @@ public class AntenatalExaminationFacade { * @param queryRequest * @return */ - public BaseResponse queryAntenatalExamination(AntenatalExaminationQueryRequest queryRequest,Integer userId) { + public BaseResponse queryAntenatalExamination(AntenatalExaminationQueryRequest queryRequest, Integer userId) { Patients patients = null; Patients patients1 = null; @@ -399,17 +428,17 @@ public class AntenatalExaminationFacade { List list = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(list)) { patients = list.get(0); - patients1=patients; + patients1 = patients; } } else { - List list1 =autoMatchFacade.matchOrgId(userId); - String hospital =null; - if(CollectionUtils.isNotEmpty(list1)){ - hospital= list1.get(0) + ""; + List list1 = autoMatchFacade.matchOrgId(userId); + String hospital = null; + if (CollectionUtils.isNotEmpty(list1)) { + hospital = list1.get(0) + ""; } //查询产妇数据 - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(),null, hospital); - patients1 = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(),null, null); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital); + patients1 = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, null); } if (null == patients) { @@ -426,17 +455,30 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(antExChulist)) { antExChuModel = antExChulist.get(0); } + HighScoreResult highScoreResult = findLastRisk(patients1.getId()); //查询产前检查记录 - List list = antenatalExaminationService.findAllByParentId(patients1.getId()); - List data = new ArrayList(); + List list = antenatalExaminationService.findAllByParentId(patients1.getId()); + /* List data = new ArrayList(); if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { List l = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); data = queryRiskName(l); } + if(CollectionUtils.isNotEmpty(list)){ + AntenatalExaminationModel antEx= list.get(0); + try{ + if(!"{}".equals(antEx.getOtherRisk())){ + JsonUtil.str2Obj(antEx.getOtherRisk(), java.util.Map.class); + } + }catch (Exception e){ + } + data.add(); + }*/ + antexListResult.convertToResult(list, patients, antExChulist); antexListResult.setIsSieve(cap(patients.getLastMenses(), patients1.getId())); - antexListResult.setRiskFactor(data); + antexListResult.setRiskFactor(highScoreResult.getHighRisk()); + antexListResult.setRiskScore(highScoreResult.getScore()+""); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); } @@ -469,14 +511,15 @@ public class AntenatalExaminationFacade { try { if (StringUtils.isNotEmpty(examinationModel.getRiskFactor())) { List list1 = JsonUtil.toList(examinationModel.getRiskFactor(), List.class); - antenatalExaminationResult.setRiskFactor(queryRisk(list1)); + HighScoreResult highScoreResult = queryRisk(list1); + antenatalExaminationResult.setRiskFactor(highScoreResult.getHighRisk()); } } catch (Exception e) { } try { if (StringUtils.isNotEmpty(examinationModel.getDiagnosis())) { List list = JsonUtil.toList(examinationModel.getDiagnosis(), List.class); - antenatalExaminationResult.setDiagnosis(queryRisk(list)); + antenatalExaminationResult.setDiagnosis(queryRisk(list).getHighRisk()); } } catch (Exception e) { } @@ -510,14 +553,14 @@ public class AntenatalExaminationFacade { try { if (StringUtils.isNotEmpty(antExChuModel.getDiagnosis())) { List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class); - antexChuResult.setDiagnosis(queryRisk(list)); + antexChuResult.setDiagnosis(queryRisk(list).getHighRisk()); } } catch (Exception e) { } try { if (StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); - antexChuResult.setHighrisk(queryRisk(list1)); + antexChuResult.setHighrisk(queryRisk(list1).getHighRisk()); } } catch (Exception e) { } @@ -536,11 +579,14 @@ public class AntenatalExaminationFacade { return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public List queryRisk(List id) { + public HighScoreResult queryRisk(List id) { + HighScoreResult highScoreResult = new HighScoreResult(); BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); List data = new ArrayList(); + Integer score = null; if (CollectionUtils.isNotEmpty(id)) { + score = 0; for (String i : id) { basicConfigQuery.setId(i); List basicConfigs = basicConfigService.queryBasicConfig(basicConfigQuery); @@ -549,12 +595,17 @@ public class AntenatalExaminationFacade { Map map = new HashMap<>(); map.put("id", basicConfig.getId()); map.put("name", basicConfig.getName()); + if (StringUtils.isNotEmpty(basicConfig.getCode())) { + score += NumberUtils.toInt(basicConfig.getCode(), 0); + } data.add(map); } } } } - return data; + highScoreResult.setHighRisk(data); + highScoreResult.setScore(score); + return highScoreResult; } public BaseResponse getEnums() { 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 f6d0ee4..6964db5 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 @@ -2,7 +2,6 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.ServiceObjEnums; import com.lyms.platform.common.enums.SmsServiceEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; @@ -55,7 +54,6 @@ public class PatientFacade { private AntenatalExaminationFacade antenatalExaminationFacade; - /** * 修改产妇的社区 * @@ -202,7 +200,7 @@ public class PatientFacade { patientsQuery.setName(riskPatientsQueryRequest.getName()); patientsQuery.sethScore(riskPatientsQueryRequest.gethScore()); patientsQuery.setrFactor(riskPatientsQueryRequest.getrFactor()); - if(null!=riskPatientsQueryRequest.getServiceType()){ + if (null != riskPatientsQueryRequest.getServiceType()) { patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType())); } patientsQuery.setAge(riskPatientsQueryRequest.getAge()); @@ -241,14 +239,15 @@ public class PatientFacade { patientBaseResult.convert(patients); } try { - patientBaseResult.setRiskFactor(antenatalExaminationFacade.findLastRisk(patients.getId())); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId()); + patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); + patientBaseResult.setRiskScore(highScoreResult.getScore()+""); } catch (Exception e) { } return new BaseObjectResponse().setData(patientBaseResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } - /** * 转成全部产妇的返回数据 * @@ -328,24 +327,20 @@ public class PatientFacade { return data; } - public BaseResponse patientGuildSms(PatientGuideSmsRequest patientGuideSmsRequest){ + public BaseResponse patientGuildSms(PatientGuideSmsRequest patientGuideSmsRequest) { MessageListRequest smsList = new MessageListRequest(); - List messages = new ArrayList<>(); + List messages = new ArrayList<>(); List sendModels = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(patientGuideSmsRequest.getIds())) - { - for(String patientId:patientGuideSmsRequest.getIds()){ - Patients patients= patientsService.findOnePatientById(patientId); - if(null!=patients){ + if (CollectionUtils.isNotEmpty(patientGuideSmsRequest.getIds())) { + for (String patientId : patientGuideSmsRequest.getIds()) { + Patients patients = patientsService.findOnePatientById(patientId); + if (null != patients) { sendModels.add(patients); } } - if (CollectionUtils.isNotEmpty(sendModels)) - { - for (Patients model : sendModels) - { - if (model != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getPhone())) - { + if (CollectionUtils.isNotEmpty(sendModels)) { + for (Patients model : sendModels) { + if (model != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getPhone())) { MessageRequest mr = new MessageRequest(); mr.setContent(patientGuideSmsRequest.getSmsContent()); mr.setObjType(Integer.valueOf(patientGuideSmsRequest.getType())); @@ -362,8 +357,7 @@ public class PatientFacade { } } - if (CollectionUtils.isNotEmpty(messages)) - { + if (CollectionUtils.isNotEmpty(messages)) { smsList.setTypeId(1); smsList.setMessages(messages); //调用发送接口 TODO diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index f310e01..e69a347 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -102,7 +102,7 @@ public class PostReviewFacade { try { if(StringUtils.isNotEmpty(postReviewModel.getDiagnosis())){ List list = JsonUtil.toList(postReviewModel.getDiagnosis(), List.class); - postReviewResult.setDiagnosis(examinationFacade.queryRisk(list)); + postReviewResult.setDiagnosis(examinationFacade.queryRisk(list).getHighRisk()); } } catch (Exception e) { } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java new file mode 100644 index 0000000..af89f64 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java @@ -0,0 +1,27 @@ +package com.lyms.platform.operate.web.result; + +import java.util.List; + +/** + * Created by Administrator on 2016/8/2 0002. + */ +public class HighScoreResult { + private List highRisk; + private Integer score; + + public List getHighRisk() { + return highRisk; + } + + public void setHighRisk(List highRisk) { + this.highRisk = highRisk; + } + + public Integer getScore() { + return score; + } + + public void setScore(Integer score) { + this.score = score; + } +} -- 1.8.3.1