Commit a8e5f30bc4db255abd86c8db8de6a35ec1401193
1 parent
7adbae9f45
Exists in
master
and in
7 other branches
分娩接口维护
Showing 1 changed file with 10 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
a8e5f30
| ... | ... | @@ -192,18 +192,18 @@ |
| 192 | 192 | patientsLocal.setFmDate(fmDate); |
| 193 | 193 | // HuJiaqi添加开始，这里冗余了分娩分娩医院，分娩年龄，分娩孕周，分娩方式，并将状态更改为产妇 |
| 194 | 194 | patientsLocal.setType(3); |
| 195 | - patientsLocal.setFmHospital(maternalDeliverModel.getFmHospital()); | |
| 196 | - patientsLocal.setFmType(maternalDeliverModel.getDeliveryMode()); | |
| 195 | + patientsLocal.setFmHospital(deliverAddRequest.getFmHospital()); | |
| 196 | + patientsLocal.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode())?null:deliverAddRequest.getDeliveryMode().toString()); | |
| 197 | 197 | try { |
| 198 | - patientsLocal.setFmAge(DateUtil.getAge(patientsLocal.getBirth(), patientsLocal.getFmDate())); | |
| 198 | + patientsLocal.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate)); | |
| 199 | 199 | } catch (Exception e) { |
| 200 | - System.out.println(patientsLocal.getId() + "：这条数据的生日和分娩时间异常"); | |
| 200 | + System.out.println(patients1.getId() + "：这条数据的生日和分娩时间异常"); | |
| 201 | 201 | // 跳过 |
| 202 | 202 | } |
| 203 | 203 | try { |
| 204 | - patientsLocal.setFmWeek(DateUtil.getDays(patientsLocal.getLastMenses(), patientsLocal.getFmDate())); | |
| 204 | + patientsLocal.setFmWeek(DateUtil.getDays(patients1.getLastMenses(), fmDate)); | |
| 205 | 205 | } catch (Exception e) { |
| 206 | - System.out.println(patientsLocal.getId() + "：这条数据的末日月经和分娩时间异常"); | |
| 206 | + System.out.println(patients1.getId() + "：这条数据的末日月经和分娩时间异常"); | |
| 207 | 207 | // 跳过 |
| 208 | 208 | } |
| 209 | 209 | // HuJiaqi添加结束 |
| 210 | 210 | |
| 211 | 211 | |
| ... | ... | @@ -315,16 +315,16 @@ |
| 315 | 315 | patients1.setFmDate(fmDate); |
| 316 | 316 | // HuJiaqi添加开始，这里冗余了分娩分娩医院，分娩年龄，分娩孕周，分娩方式，并将状态更改为产妇 |
| 317 | 317 | patients1.setType(3); |
| 318 | - patients1.setFmHospital(maternalDeliverModel.getFmHospital()); | |
| 319 | - patients1.setFmType(maternalDeliverModel.getDeliveryMode()); | |
| 318 | + patients1.setFmHospital(deliverAddRequest.getFmHospital()); | |
| 319 | + patients1.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode())?null:deliverAddRequest.getDeliveryMode().toString()); | |
| 320 | 320 | try { |
| 321 | - patients1.setFmAge(DateUtil.getAge(patients1.getBirth(), patients1.getFmDate())); | |
| 321 | + patients1.setFmAge(DateUtil.getAge(patients1.getBirth(), fmDate)); | |
| 322 | 322 | } catch (Exception e) { |
| 323 | 323 | System.out.println(patients1.getId() + "：这条数据的生日和分娩时间异常"); |
| 324 | 324 | // 跳过 |
| 325 | 325 | } |
| 326 | 326 | try { |
| 327 | - patients1.setFmWeek(DateUtil.getDays(patients1.getLastMenses(), patients1.getFmDate())); | |
| 327 | + patients1.setFmWeek(DateUtil.getDays(patients1.getLastMenses(), fmDate)); | |
| 328 | 328 | } catch (Exception e) { |
| 329 | 329 | System.out.println(patients1.getId() + "：这条数据的末日月经和分娩时间异常"); |
| 330 | 330 | // 跳过 |