Commit 20d8c0543816a393b56281f532608840856cd97c
1 parent
ec4096377b
Exists in
master
and in
6 other branches
新生儿筛查
Showing 2 changed files with 78 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
View file @
20d8c05
... | ... | @@ -290,7 +290,11 @@ |
290 | 290 | for(MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList){ |
291 | 291 | for(BabyModel babyModel : babyModelList){ |
292 | 292 | if(maternalDeliverModel.getParentId().equals(babyModel.getParentId())){ |
293 | + BabySieveModel babySieveModel = new BabySieveModel(); | |
294 | + babySieveModel = babySieveService.getBabySieveQueryBybabyId(babyModel.getId()); | |
293 | 295 | BabySieveManager babySieveManager = new BabySieveManager(); |
296 | + babySieveManager.setMatdeliverId(maternalDeliverModel.getId()); | |
297 | + babySieveManager.setId(babySieveModel.getId()); | |
294 | 298 | //获取母亲基本信息 |
295 | 299 | Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); |
296 | 300 | //获取高危因素,高危评分 |
297 | 301 | |
... | ... | @@ -300,12 +304,16 @@ |
300 | 304 | if(null != patients.getDueDate()){ |
301 | 305 | babySieveManager.setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); |
302 | 306 | } |
307 | + babySieveManager.setPatientId(patients.getId()); | |
308 | + babySieveManager.setCardNo(patients.getCardNo()); | |
309 | + babySieveManager.setPhone(patients.getPhone()); | |
310 | + babySieveManager.setBabyId(babyModel.getId()); | |
303 | 311 | List<MaternalDeliverModel.Baby> babies = maternalDeliverModel.getBaby(); |
304 | 312 | if (CollectionUtils.isNotEmpty(babies)) { |
305 | 313 | for (MaternalDeliverModel.Baby baby : babies) { |
306 | 314 | if(baby.getId() != null && baby.getId().equals(babyModel.getId())){ |
307 | 315 | if(maternalDeliverModel.getDueWeek() != null){ |
308 | - babySieveManager.setDueWeek(Integer.parseInt(maternalDeliverModel.getDueWeek().substring(0, 1))); | |
316 | + babySieveManager.setDueWeek(maternalDeliverModel.getDueWeek()); | |
309 | 317 | } |
310 | 318 | String time = baby.getDueTime(); |
311 | 319 | if(StringUtils.isNotEmpty(time)){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java
View file @
20d8c05
... | ... | @@ -8,6 +8,24 @@ |
8 | 8 | */ |
9 | 9 | public class BabySieveManager { |
10 | 10 | |
11 | + //儿童建档ID | |
12 | + private String babyId; | |
13 | + | |
14 | + //母亲ID | |
15 | + private String patientId; | |
16 | + | |
17 | + //新生儿筛查ID | |
18 | + private String id; | |
19 | + | |
20 | + //分娩ID | |
21 | + private String matdeliverId; | |
22 | + | |
23 | + //母亲身份证号 | |
24 | + private String cardNo; | |
25 | + | |
26 | + //母亲手机号 | |
27 | + private String phone; | |
28 | + | |
11 | 29 | //分娩日期 |
12 | 30 | private String birthYMD; |
13 | 31 | |
... | ... | @@ -35,7 +53,7 @@ |
35 | 53 | private String yChanQi; |
36 | 54 | |
37 | 55 | //分娩孕周 |
38 | - private Integer dueWeek; | |
56 | + private String dueWeek; | |
39 | 57 | |
40 | 58 | //分娩方式 |
41 | 59 | private String dueType; |
... | ... | @@ -49,6 +67,54 @@ |
49 | 67 | //母亲姓名 |
50 | 68 | private String mName; |
51 | 69 | |
70 | + public String getBabyId() { | |
71 | + return babyId; | |
72 | + } | |
73 | + | |
74 | + public void setBabyId(String babyId) { | |
75 | + this.babyId = babyId; | |
76 | + } | |
77 | + | |
78 | + public String getPatientId() { | |
79 | + return patientId; | |
80 | + } | |
81 | + | |
82 | + public void setPatientId(String patientId) { | |
83 | + this.patientId = patientId; | |
84 | + } | |
85 | + | |
86 | + public String getId() { | |
87 | + return id; | |
88 | + } | |
89 | + | |
90 | + public void setId(String id) { | |
91 | + this.id = id; | |
92 | + } | |
93 | + | |
94 | + public String getMatdeliverId() { | |
95 | + return matdeliverId; | |
96 | + } | |
97 | + | |
98 | + public void setMatdeliverId(String matdeliverId) { | |
99 | + this.matdeliverId = matdeliverId; | |
100 | + } | |
101 | + | |
102 | + public String getCardNo() { | |
103 | + return cardNo; | |
104 | + } | |
105 | + | |
106 | + public void setCardNo(String cardNo) { | |
107 | + this.cardNo = cardNo; | |
108 | + } | |
109 | + | |
110 | + public String getPhone() { | |
111 | + return phone; | |
112 | + } | |
113 | + | |
114 | + public void setPhone(String phone) { | |
115 | + this.phone = phone; | |
116 | + } | |
117 | + | |
52 | 118 | public List getRiskFactor() { |
53 | 119 | return riskFactor; |
54 | 120 | } |
55 | 121 | |
... | ... | @@ -121,11 +187,11 @@ |
121 | 187 | this.highRisk = highRisk; |
122 | 188 | } |
123 | 189 | |
124 | - public Integer getDueWeek() { | |
190 | + public String getDueWeek() { | |
125 | 191 | return dueWeek; |
126 | 192 | } |
127 | 193 | |
128 | - public void setDueWeek(Integer dueWeek) { | |
194 | + public void setDueWeek(String dueWeek) { | |
129 | 195 | this.dueWeek = dueWeek; |
130 | 196 | } |
131 | 197 |