From 03c627ff2d9c46bebfa18226bbef3047035a02eb Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 13 Oct 2020 13:54:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E6=97=B6=E9=97=B4=E8=BD=B4?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AB=98=E5=8D=B1=E5=9B=A0=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 59 ++++++++++++++++++---- .../lyms/platform/operate/web/result/AntData.java | 18 ++++++- 2 files changed, 65 insertions(+), 12 deletions(-) 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 7278408..289bb84 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 @@ -2080,7 +2080,7 @@ public class AntenatalExaminationFacade { if (null != an.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } - listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses())); + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getHighrisk(),an.getOtherHighRisk()))); } } @@ -2103,7 +2103,7 @@ public class AntenatalExaminationFacade { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } - listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses())); + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getRiskFactor(),an.getOtherRisk()))); } } /* @@ -2295,7 +2295,7 @@ public class AntenatalExaminationFacade { if (null != an.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } - listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses())); + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getHighrisk(),an.getOtherHighRisk()))); } } @@ -2312,7 +2312,7 @@ public class AntenatalExaminationFacade { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } - listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses())); + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getRiskFactor(),an.getOtherRisk()))); } } //分娩记录 @@ -2480,7 +2480,7 @@ public class AntenatalExaminationFacade { if (null != an.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } - listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses())); + listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses(),getRisk(an.getHighrisk(),an.getOtherHighRisk()))); } } @@ -2504,7 +2504,7 @@ public class AntenatalExaminationFacade { if (null != an.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } - listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses())); + listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses(),getRisk(an.getRiskFactor(), an.getOtherRisk()))); } } return listData; @@ -2967,7 +2967,7 @@ public class AntenatalExaminationFacade { if (null != an.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } - data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses())); + data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getHighrisk(),an.getOtherHighRisk()))); } } @@ -2983,7 +2983,7 @@ public class AntenatalExaminationFacade { if (null != an.getHospitalId()) { organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId())); } - data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses())); + data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getRiskFactor(),an.getOtherRisk()))); } } @@ -3689,7 +3689,8 @@ public class AntenatalExaminationFacade { organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId())); } if (null != patients) { - dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses())); + dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses(), + getRisk(antExChuModel1.getHighrisk(),antExChuModel1.getOtherHighRisk()))); } } } @@ -3700,7 +3701,8 @@ public class AntenatalExaminationFacade { } Patients patients = patientsService.findOnePatientById(model.getParentId()); if (null != patients) { - dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses())); + dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses(), + getRisk(model.getRiskFactor(),model.getOtherRisk()))); } } } @@ -3708,6 +3710,43 @@ public class AntenatalExaminationFacade { return dataList; } + + private List > getRisk(String highRisk, String oRisk) { + HighScoreResult highScoreResult = null; + if (StringUtils.isNotEmpty(highRisk)) { + List ids = JsonUtil.toList(highRisk, String.class); + if (CollectionUtils.isNotEmpty(ids)) { + highScoreResult = ResolveUtils.queryRisk(ids, true, basicConfigService); + } + } + Integer score = 0; + if (highScoreResult != null && highScoreResult.getScore() != null) { + score = highScoreResult.getScore(); + } + List > list = new ArrayList <>(); + List > checkList = ResolveUtils.queryHighRisk(highScoreResult); + if (CollectionUtils.isNotEmpty(checkList)) { + list.addAll(checkList); + } + if (StringUtils.isNotEmpty(oRisk) && !"{}".equals(oRisk) && !"[]".equals(oRisk)) { + List > listOtherRisk = new ArrayList <>(); + ResolveUtils.queryOtherRisk(oRisk, listOtherRisk); + + for (Map otherRisk : listOtherRisk) { + if (otherRisk != null) { + if (otherRisk.get("score") != null && StringUtils.isNotEmpty(otherRisk.get("score").toString())) { + String s = (String) otherRisk.get("score"); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(s) && FunvCommonUtil.isNumeric(s)) { + score += Integer.parseInt(s); + } + } + } + list.add(otherRisk); + } + } + return list; + } + private List queryRiskListName(List l) { List data = new ArrayList(); for (int i = 0; i < l.size(); i++) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java index ad0d4e7..94fe963 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java @@ -7,6 +7,8 @@ import com.lyms.platform.pojo.*; import org.codehaus.jackson.annotate.JsonIgnore; import java.util.Date; +import java.util.List; +import java.util.Map; public class AntData extends BaseModel{ private String dueWeek; @@ -25,6 +27,16 @@ public class AntData extends BaseModel{ //enableEdit 字段 1 可编辑 0 不可编辑 private String enableEdit="1"; + private List> risks; + + public List> getRisks() { + return risks; + } + + public void setRisks(List> risks) { + this.risks = risks; + } + public String getEnableEdit() { return enableEdit; } @@ -81,7 +93,7 @@ public class AntData extends BaseModel{ this.dueDate = dueDate; } - public AntData(AntenatalExaminationModel model,String hospitalName,Date lastMenses) { + public AntData(AntenatalExaminationModel model,String hospitalName,Date lastMenses,List> risks) { this.id = model.getId(); int days = DateUtil.daysBetween(lastMenses, model.getCheckDate()); this.dueWeek = StringUtils.dueWeek(days); @@ -93,9 +105,10 @@ public class AntData extends BaseModel{ this.type="3"; this.hospitalName=hospitalName; this.hospitalId=model.getHospitalId(); + this.risks=risks; } - public AntData(AntExChuModel model,String hospitalName,Date lastMenses) { + public AntData(AntExChuModel model,String hospitalName,Date lastMenses,List> risks) { this.id = model.getId(); int days = DateUtil.daysBetween(lastMenses, model.getCheckTime()); this.dueWeek = StringUtils.dueWeek(days); @@ -108,6 +121,7 @@ public class AntData extends BaseModel{ this.type="2"; this.hospitalName=hospitalName; this.hospitalId=model.getHospitalId(); + this.risks=risks; } public AntData(Patients model,String hospitalName) { -- 1.8.3.1