Commit ac5743d922103109bf853597b0a457c7c50816e1
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
ac5743d
| ... | ... | @@ -658,11 +658,12 @@ |
| 658 | 658 | bm.setBabyWeight(b.getBabyWeight()); |
| 659 | 659 | bm.setHospitalId(b.getHospitalId()); |
| 660 | 660 | |
| 661 | - bm.setHighRisk(b.getHighRisk()); | |
| 661 | + | |
| 662 | 662 | //bm.setHighRiskReason(b.getHighRiskReason()); |
| 663 | 663 | bm.setExpVip(b.getExpVip()); |
| 664 | 664 | bm.setMremark(b.getMremark()); |
| 665 | 665 | bm.setDiagnose(JsonUtil.array2JsonString(b.getDiagnose())); |
| 666 | + bm.setLastDiagnose(JsonUtil.array2JsonString(b.getDiagnose())); | |
| 666 | 667 | |
| 667 | 668 | if (b.getExpType() != null) { |
| 668 | 669 | if (b.getExpType() == ExpEnums.SGY.getId()) { |
| 669 | 670 | |
| ... | ... | @@ -689,8 +690,16 @@ |
| 689 | 690 | bm.setHospitalId(b.getHospitalId()); |
| 690 | 691 | bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar())); |
| 691 | 692 | |
| 693 | + if (b.getHighRisk() == null) { | |
| 694 | + bm.setLastHighRisk(0); | |
| 695 | + bm.setHighRisk(0); | |
| 696 | + } | |
| 697 | + else | |
| 698 | + { | |
| 699 | + bm.setLastHighRisk(b.getHighRisk()); | |
| 700 | + bm.setHighRisk(b.getHighRisk()); | |
| 701 | + } | |
| 692 | 702 | |
| 693 | - bm.setLastHighRisk(b.getHighRisk()); | |
| 694 | 703 | |
| 695 | 704 | |
| 696 | 705 | return bm; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
ac5743d
| ... | ... | @@ -71,7 +71,13 @@ |
| 71 | 71 | //儿童体检后 更新下次预约时间和是否高危 在基础数据表里面 |
| 72 | 72 | BabyModel bm = new BabyModel(); |
| 73 | 73 | bm.setModified(new Date()); |
| 74 | - bm.setLastHighRisk(request.getHighRisk()); | |
| 74 | + if (request.getHighRisk() == null) { | |
| 75 | + bm.setLastHighRisk(0); | |
| 76 | + } | |
| 77 | + else | |
| 78 | + { | |
| 79 | + bm.setLastHighRisk(request.getHighRisk()); | |
| 80 | + } | |
| 75 | 81 | bm.setNextDate(DateUtil.parseYMD(request.getNextDate())); |
| 76 | 82 | if (CollectionUtils.isNotEmpty(request.getDiagnose())) |
| 77 | 83 | { |
| 78 | 84 | |
| 79 | 85 | |
| ... | ... | @@ -154,14 +160,20 @@ |
| 154 | 160 | model.setGuideSuggest(request.getGuideSuggest()); |
| 155 | 161 | model.setCheckDoctor(request.getCheckDoctor()); |
| 156 | 162 | model.setNextDate(DateUtil.parseYMD(request.getNextDate())); |
| 157 | - model.setHighRisk(request.getHighRisk()); | |
| 158 | 163 | |
| 164 | + | |
| 165 | + if (request.getHighRisk() == null){ | |
| 166 | + model.setHighRisk(0); | |
| 167 | + } | |
| 168 | + else | |
| 169 | + { | |
| 170 | + model.setHighRisk(request.getHighRisk()); | |
| 171 | + } | |
| 172 | + | |
| 159 | 173 | model.setDrugGllergic(JsonUtil.obj2JsonString(request.getDrugGllergic())); |
| 160 | 174 | model.setChestw(request.getChestw()); |
| 161 | 175 | |
| 162 | 176 | |
| 163 | - | |
| 164 | - | |
| 165 | 177 | model.setCheckDate(DateUtil.parseYMD(request.getCheckDate())); |
| 166 | 178 | |
| 167 | 179 | return model; |
| ... | ... | @@ -178,7 +190,15 @@ |
| 178 | 190 | //儿童体检后 更新下次预约时间和是否高危 在基础数据表里面 |
| 179 | 191 | BabyModel bm = new BabyModel(); |
| 180 | 192 | bm.setModified(new Date()); |
| 181 | - bm.setLastHighRisk(request.getHighRisk()); | |
| 193 | + if (request.getHighRisk() == null) | |
| 194 | + { | |
| 195 | + bm.setLastHighRisk(0); | |
| 196 | + } | |
| 197 | + else | |
| 198 | + { | |
| 199 | + bm.setLastHighRisk(request.getHighRisk()); | |
| 200 | + } | |
| 201 | + | |
| 182 | 202 | bm.setNextDate(DateUtil.parseYMD(request.getNextDate())); |
| 183 | 203 | if (CollectionUtils.isNotEmpty(request.getDiagnose())) |
| 184 | 204 | { |