liquanyu / regional-platform

Download as
Browse Code »

Commit 03c627ff2d9c46bebfa18226bbef3047035a02eb

Authored by liquanyu
1 parent 3265f9fb3c
Exists in master and in 1 other branch dev

产检时间轴添加高危因素

Showing 2 changed files with 65 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 03c627f
... ... @@ -2080,7 +2080,7 @@
2080 2080 if (null != an.getHospitalId()) {
2081 2081 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
2082 2082 }
2083   - listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
  2083 + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getHighrisk(),an.getOtherHighRisk())));
2084 2084 }
2085 2085 }
2086 2086  
... ... @@ -2103,7 +2103,7 @@
2103 2103 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
2104 2104 }
2105 2105  
2106   - listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
  2106 + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getRiskFactor(),an.getOtherRisk())));
2107 2107 }
2108 2108 }
2109 2109 /*
... ... @@ -2295,7 +2295,7 @@
2295 2295 if (null != an.getHospitalId()) {
2296 2296 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
2297 2297 }
2298   - listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
  2298 + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getHighrisk(),an.getOtherHighRisk())));
2299 2299 }
2300 2300 }
2301 2301  
... ... @@ -2312,7 +2312,7 @@
2312 2312 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
2313 2313 }
2314 2314  
2315   - listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
  2315 + listData.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getRiskFactor(),an.getOtherRisk())));
2316 2316 }
2317 2317 }
2318 2318 //分娩记录
... ... @@ -2480,7 +2480,7 @@
2480 2480 if (null != an.getHospitalId()) {
2481 2481 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
2482 2482 }
2483   - listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses()));
  2483 + listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses(),getRisk(an.getHighrisk(),an.getOtherHighRisk())));
2484 2484 }
2485 2485 }
2486 2486  
... ... @@ -2504,7 +2504,7 @@
2504 2504 if (null != an.getHospitalId()) {
2505 2505 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
2506 2506 }
2507   - listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses()));
  2507 + listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses(),getRisk(an.getRiskFactor(), an.getOtherRisk())));
2508 2508 }
2509 2509 }
2510 2510 return listData;
... ... @@ -2967,7 +2967,7 @@
2967 2967 if (null != an.getHospitalId()) {
2968 2968 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
2969 2969 }
2970   - data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
  2970 + data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getHighrisk(),an.getOtherHighRisk())));
2971 2971 }
2972 2972 }
2973 2973  
... ... @@ -2983,7 +2983,7 @@
2983 2983 if (null != an.getHospitalId()) {
2984 2984 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
2985 2985 }
2986   - data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses()));
  2986 + data.add(new AntData(an, null != organization ? organization.getName() : "", patients.getLastMenses(),getRisk(an.getRiskFactor(),an.getOtherRisk())));
2987 2987 }
2988 2988 }
2989 2989  
... ... @@ -3689,7 +3689,8 @@
3689 3689 organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId()));
3690 3690 }
3691 3691 if (null != patients) {
3692   - dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses()));
  3692 + dataList.add(new AntData(antExChuModel1, null != organization ? organization.getName() : "", patients.getLastMenses(),
  3693 + getRisk(antExChuModel1.getHighrisk(),antExChuModel1.getOtherHighRisk())));
3693 3694 }
3694 3695 }
3695 3696 }
3696 3697  
... ... @@ -3700,12 +3701,50 @@
3700 3701 }
3701 3702 Patients patients = patientsService.findOnePatientById(model.getParentId());
3702 3703 if (null != patients) {
3703   - dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses()));
  3704 + dataList.add(new AntData(model, null != organization ? organization.getName() : "", patients.getLastMenses(),
  3705 + getRisk(model.getRiskFactor(),model.getOtherRisk())));
3704 3706 }
3705 3707 }
3706 3708 }
3707 3709 sort(dataList);
3708 3710 return dataList;
  3711 + }
  3712 +
  3713 +
  3714 + private List <Map <String, Object>> getRisk(String highRisk, String oRisk) {
  3715 + HighScoreResult highScoreResult = null;
  3716 + if (StringUtils.isNotEmpty(highRisk)) {
  3717 + List <String> ids = JsonUtil.toList(highRisk, String.class);
  3718 + if (CollectionUtils.isNotEmpty(ids)) {
  3719 + highScoreResult = ResolveUtils.queryRisk(ids, true, basicConfigService);
  3720 + }
  3721 + }
  3722 + Integer score = 0;
  3723 + if (highScoreResult != null && highScoreResult.getScore() != null) {
  3724 + score = highScoreResult.getScore();
  3725 + }
  3726 + List <Map <String, Object>> list = new ArrayList <>();
  3727 + List <Map <String, Object>> checkList = ResolveUtils.queryHighRisk(highScoreResult);
  3728 + if (CollectionUtils.isNotEmpty(checkList)) {
  3729 + list.addAll(checkList);
  3730 + }
  3731 + if (StringUtils.isNotEmpty(oRisk) && !"{}".equals(oRisk) && !"[]".equals(oRisk)) {
  3732 + List <Map <String, Object>> listOtherRisk = new ArrayList <>();
  3733 + ResolveUtils.queryOtherRisk(oRisk, listOtherRisk);
  3734 +
  3735 + for (Map <String, Object> otherRisk : listOtherRisk) {
  3736 + if (otherRisk != null) {
  3737 + if (otherRisk.get("score") != null && StringUtils.isNotEmpty(otherRisk.get("score").toString())) {
  3738 + String s = (String) otherRisk.get("score");
  3739 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(s) && FunvCommonUtil.isNumeric(s)) {
  3740 + score += Integer.parseInt(s);
  3741 + }
  3742 + }
  3743 + }
  3744 + list.add(otherRisk);
  3745 + }
  3746 + }
  3747 + return list;
3709 3748 }
3710 3749  
3711 3750 private List queryRiskListName(List l) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntData.java View file @ 03c627f
... ... @@ -7,6 +7,8 @@
7 7 import org.codehaus.jackson.annotate.JsonIgnore;
8 8  
9 9 import java.util.Date;
  10 +import java.util.List;
  11 +import java.util.Map;
10 12  
11 13 public class AntData extends BaseModel{
12 14 private String dueWeek;
... ... @@ -25,6 +27,16 @@
25 27 //enableEdit 字段 1 可编辑 0 不可编辑
26 28 private String enableEdit="1";
27 29  
  30 + private List<Map<String, Object>> risks;
  31 +
  32 + public List<Map<String, Object>> getRisks() {
  33 + return risks;
  34 + }
  35 +
  36 + public void setRisks(List<Map<String, Object>> risks) {
  37 + this.risks = risks;
  38 + }
  39 +
28 40 public String getEnableEdit() {
29 41 return enableEdit;
30 42 }
... ... @@ -81,7 +93,7 @@
81 93 this.dueDate = dueDate;
82 94 }
83 95  
84   - public AntData(AntenatalExaminationModel model,String hospitalName,Date lastMenses) {
  96 + public AntData(AntenatalExaminationModel model,String hospitalName,Date lastMenses,List<Map<String, Object>> risks) {
85 97 this.id = model.getId();
86 98 int days = DateUtil.daysBetween(lastMenses, model.getCheckDate());
87 99 this.dueWeek = StringUtils.dueWeek(days);
88 100  
... ... @@ -93,9 +105,10 @@
93 105 this.type="3";
94 106 this.hospitalName=hospitalName;
95 107 this.hospitalId=model.getHospitalId();
  108 + this.risks=risks;
96 109 }
97 110  
98   - public AntData(AntExChuModel model,String hospitalName,Date lastMenses) {
  111 + public AntData(AntExChuModel model,String hospitalName,Date lastMenses,List<Map<String, Object>> risks) {
99 112 this.id = model.getId();
100 113 int days = DateUtil.daysBetween(lastMenses, model.getCheckTime());
101 114 this.dueWeek = StringUtils.dueWeek(days);
... ... @@ -108,6 +121,7 @@
108 121 this.type="2";
109 122 this.hospitalName=hospitalName;
110 123 this.hospitalId=model.getHospitalId();
  124 + this.risks=risks;
111 125 }
112 126  
113 127 public AntData(Patients model,String hospitalName) {