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 bcf76ad..6eed7cb 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 @@ -152,7 +152,7 @@ public class AntenatalExaminationFacade { antExChuModel.setYn(YnEnums.YES.getId()); antenatalExaminationService.addOneAntEx(antExChuModel); //修改患者风险等级 - patients.setLastCheckEmployeeId(userId+""); + patients.setLastCheckEmployeeId(userId + ""); updatePatientRiskLevel(antExChuModel, patients); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); @@ -226,7 +226,7 @@ public class AntenatalExaminationFacade { * * @return */ - public HighScoreResult findLastRisk(String parentId) { + public HighScoreResult findLastRisk(String parentId,boolean needLevel) { List list = antenatalExaminationService.findAllByParentId(parentId); AntenatalExaminationModel model = null; if (CollectionUtils.isNotEmpty(list)) { @@ -237,7 +237,7 @@ public class AntenatalExaminationFacade { //复诊 if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"{}".equals(model.getRiskFactor())) { List list1 = JsonUtil.toList(model.getRiskFactor(), List.class); - highScoreResult = queryRisk(list1); + highScoreResult = queryRisk(list1,needLevel); } if (null != model && !"{}".equals(model.getOtherRisk())) { Map map = JsonUtil.str2Obj(model.getOtherRisk(), Map.class); @@ -253,6 +253,14 @@ public class AntenatalExaminationFacade { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0)); } + if(needLevel){ + Object idObj1 = map.get("fyyse"); + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); + Map map2 = new HashMap<>(); + map2.put("id", basicConfig.getId()); + map2.put("name", basicConfig.getName()); + highScoreResult.getLevel().add(map2); + } } //初诊 AntExChuQuery antExChuQuery = new AntExChuQuery(); @@ -265,7 +273,7 @@ public class AntenatalExaminationFacade { } if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"{}".equals(antExChuModel.getHighrisk())) { List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); - highScoreResult = queryRisk(list2); + highScoreResult = queryRisk(list2,false); } if (null != antExChuModel && !"{}".equals(antExChuModel.getOtherHighRisk())) { Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class); @@ -280,6 +288,14 @@ public class AntenatalExaminationFacade { BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj.toString()); highScoreResult.setScore(highScoreResult.getScore() + NumberUtils.toInt(basicConfig.getName(), 0)); } + if(needLevel){ + Object idObj1 = map.get("fyyse"); + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); + Map map2 = new HashMap<>(); + map2.put("id", basicConfig.getId()); + map2.put("name", basicConfig.getName()); + highScoreResult.getLevel().add(map2); + } } } catch (Exception e) { } @@ -307,7 +323,7 @@ public class AntenatalExaminationFacade { antexListResult.convertToResult(null, list.get(0), null); for (Patients patients : list) { - HighScoreResult highScoreResult = findLastRisk(patients.getId()); + HighScoreResult highScoreResult = findLastRisk(patients.getId(),false); antexListResult.setRiskFactor(highScoreResult.getHighRisk()); antexListResult.setRiskScore(highScoreResult.getScore() + ""); List stopPregs = null; @@ -540,7 +556,7 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(antExChulist)) { antExChuModel = antExChulist.get(0); }*/ - HighScoreResult highScoreResult = findLastRisk(patients.getId()); + HighScoreResult highScoreResult = findLastRisk(patients.getId(),false); AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setPid(patients.getPid()); @@ -620,7 +636,7 @@ public class AntenatalExaminationFacade { try { if (StringUtils.isNotEmpty(examinationModel.getRiskFactor())) { List list1 = JsonUtil.toList(examinationModel.getRiskFactor(), List.class); - HighScoreResult highScoreResult = queryRisk(list1); + HighScoreResult highScoreResult = queryRisk(list1,false); antenatalExaminationResult.setRiskFactor(highScoreResult.getHighRisk()); } } catch (Exception e) { @@ -628,7 +644,7 @@ public class AntenatalExaminationFacade { try { if (StringUtils.isNotEmpty(examinationModel.getDiagnosis())) { List list = JsonUtil.toList(examinationModel.getDiagnosis(), List.class); - antenatalExaminationResult.setDiagnosis(queryRisk(list).getHighRisk()); + antenatalExaminationResult.setDiagnosis(queryRisk(list,false).getHighRisk()); } } catch (Exception e) { } @@ -662,14 +678,14 @@ public class AntenatalExaminationFacade { try { if (StringUtils.isNotEmpty(antExChuModel.getDiagnosis())) { List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class); - antexChuResult.setDiagnosis(queryRisk(list).getHighRisk()); + antexChuResult.setDiagnosis(queryRisk(list,false).getHighRisk()); } } catch (Exception e) { } try { if (StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); - antexChuResult.setHighrisk(queryRisk(list1).getHighRisk()); + antexChuResult.setHighrisk(queryRisk(list1,false).getHighRisk()); } } catch (Exception e) { } @@ -688,11 +704,12 @@ public class AntenatalExaminationFacade { return new BaseObjectResponse().setData(object).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public HighScoreResult queryRisk(List id) { + public HighScoreResult queryRisk(List id,boolean n) { HighScoreResult highScoreResult = new HighScoreResult(); BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); List data = new ArrayList(); + List dat1a = new ArrayList(); Integer score = null; if (CollectionUtils.isNotEmpty(id)) { score = 0; @@ -707,6 +724,15 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(basicConfig.getCode())) { score += NumberUtils.toInt(basicConfig.getCode(), 0); } + if(n){ + BasicConfig basicConfig1= basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); + if(null!=basicConfig1){ + Map map1 = new HashMap<>(); + map1.put("id", basicConfig1.getId()); + map1.put("name", basicConfig1.getName()); + dat1a.add(dat1a); + } + } data.add(map); } } @@ -714,6 +740,7 @@ public class AntenatalExaminationFacade { } highScoreResult.setHighRisk(data); highScoreResult.setScore(score); + highScoreResult.setLevel(dat1a); return highScoreResult; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 0f57b9d..ecb96ca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -291,7 +291,7 @@ public class MatDeliverFacade { antExQuery.setParentId(patients.getId()); antExQuery.setYn(YnEnums.YES.getId()); List examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId()); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(),false); try { String tTireNumber = ""; 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 eecc505..fd29f9a 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 @@ -243,7 +243,7 @@ public class PatientFacade { patientBaseResult.convert(patients); } try { - HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId()); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(),false); patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); patientBaseResult.setRiskScore(highScoreResult.getScore() + ""); } catch (Exception e) { @@ -270,9 +270,9 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); - if (null!=users) { + if (null != users) { chanResult.setlName(users.getName()); - }else{ + } else { chanResult.setlName(patients.getBookbuildingDoctor()); } @@ -284,9 +284,9 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - if(null!=users){ + if (null != users) { chanResult.setCheckDoctor(users.getName()); - }else{ + } else { chanResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } else { @@ -330,9 +330,9 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); - if(null!=users){ + if (null != users) { quanPatientsResult.setlName(users.getName()); - }else{ + } else { quanPatientsResult.setlName(patients.getBookbuildingDoctor()); } @@ -343,9 +343,9 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - if(null!=users){ + if (null != users) { quanPatientsResult.setCheckDoctor(users.getName()); - }else{ + } else { quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } else { @@ -391,9 +391,9 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); - if(null!=users){ + if (null != users) { riskPatientsResult.setlName(users.getName()); - }else{ + } else { riskPatientsResult.setlName(patients.getBookbuildingDoctor()); } } else { @@ -403,16 +403,16 @@ public class PatientFacade { if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - if(null!=users){ + if (null != users) { riskPatientsResult.setCheckDoctor(users.getName()); - }else{ + } else { riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } else { riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } - HighScoreResult highScoreResult= antenatalExaminationFacade.findLastRisk(patients.getId()); + HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(),true); //复诊次数 int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); antExChuQuery.setParentId(patients.getId()); @@ -431,16 +431,8 @@ public class PatientFacade { } } riskPatientsResult.setcTime(nextCheckTime); - if(CollectionUtils.isNotEmpty(highScoreResult.getHighRisk())){ - List list = highScoreResult.getHighRisk(); - StringBuilder stringBuilder=new StringBuilder(); - for(int i1=0;i1 map = (java.util.Map)list.get(i1); - stringBuilder.append(map.get("name")).append(","); - } - riskPatientsResult.setrFactor(stringBuilder.toString()); - } - + riskPatientsResult.setrFactor(highScoreResult.gethighRiskStr()); + riskPatientsResult.setrLevel(highScoreResult.getLevelStr()); riskPatientsResult.sethScore(highScoreResult.getScore()); data.add(riskPatientsResult); } 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 5242316..369a9fb 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 @@ -93,7 +93,7 @@ public class PostReviewFacade { dueDate= list.get(0).getDueDate(); } - HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getId()); + HighScoreResult highScoreResult = examinationFacade.findLastRisk(patientsList.getId(),false); postReviewListResult.convertToResult(postReviewModels, patientsList, dueDate); postReviewListResult.setRiskFactor(highScoreResult.getHighRisk()); postReviewListResult.setRiskScore(highScoreResult.getScore()+""); @@ -120,7 +120,7 @@ public class PostReviewFacade { try { if(StringUtils.isNotEmpty(postReviewModel.getDiagnosis())){ List list = JsonUtil.toList(postReviewModel.getDiagnosis(), List.class); - postReviewResult.setDiagnosis(examinationFacade.queryRisk(list).getHighRisk()); + postReviewResult.setDiagnosis(examinationFacade.queryRisk(list,false).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 index 4ddb62c..cc770c4 100644 --- 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 @@ -1,18 +1,32 @@ package com.lyms.platform.operate.web.result; +import java.util.ArrayList; import java.util.List; /** * Created by Administrator on 2016/8/2 0002. */ public class HighScoreResult { - private List highRisk ; - private Integer score=0; + + //高危因素 + private List highRisk = new ArrayList(); + //风险等级颜色 + private List level; + //高危评分 + private Integer score = 0; public List getHighRisk() { return highRisk; } + public List getLevel() { + return level; + } + + public void setLevel(List level) { + this.level = level; + } + public void setHighRisk(List highRisk) { this.highRisk = highRisk; } @@ -24,4 +38,33 @@ public class HighScoreResult { public void setScore(Integer score) { this.score = score; } + + public String getLevelStr() { + StringBuilder stringBuilder = new StringBuilder(); + if (null == level) { + return ""; + } + for (int i1 = 0; i1 < level.size(); i1++) { + java.util.Map map = (java.util.Map) level.get(i1); + String name = map.get("name"); + if (stringBuilder.indexOf(name) == -1) { + stringBuilder.append(map.get("name")).append(", "); + } + } + stringBuilder.setLength(stringBuilder.length() - 1); + return stringBuilder.toString(); + } + + public String gethighRiskStr() { + StringBuilder stringBuilder = new StringBuilder(); + if (null == highRisk) { + return ""; + } + for (int i1 = 0; i1 < highRisk.size(); i1++) { + java.util.Map map = (java.util.Map) highRisk.get(i1); + stringBuilder.append(map.get("name")).append(", "); + } + stringBuilder.setLength(stringBuilder.length() - 1); + return stringBuilder.toString(); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java index 96b6eea..beb7fc6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java @@ -170,7 +170,7 @@ public class RiskPatientsResult implements IBasicResultConvert