Commit c20a674a22d172d2fd2d346b7e24a0ab6d2dc5af
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-common/src/main/java/com/lyms/platform/common/enums/StopPregEnums.java
View file @
c20a674
| ... | ... | @@ -13,7 +13,7 @@ |
| 13 | 13 | public enum StopPregEnums { |
| 14 | 14 | |
| 15 | 15 | |
| 16 | - GFX(0,"高风险高危"),PTTZ(1,"胚胎停止发育"),FYYW(2,"妊娠早期服用药物"),CQZDYX(3,"产前诊断阳性"),OTHER(3,"其他"); | |
| 16 | + GFX(0,"高风险高危"),PTTZ(1,"胚胎停止发育"),FYYW(2,"妊娠早期服用药物"),CQZDYX(3,"产前诊断阳性"),OTHER(4,"其他"); | |
| 17 | 17 | |
| 18 | 18 | StopPregEnums(int id, String name) { |
| 19 | 19 | this.id = id; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
c20a674
| ... | ... | @@ -155,12 +155,12 @@ |
| 155 | 155 | personModelQuery.setTypes(new Integer[]{1,3}); //孕妇或者产妇基本信息 |
| 156 | 156 | List<PersonModel> personModels = personService.queryPersons(personModelQuery); |
| 157 | 157 | |
| 158 | - if (personModels == null || personModels.size() == 0) | |
| 159 | - { | |
| 160 | - personModelQuery.setPhone(yunRequest.getPregnantPhone()); | |
| 161 | - personModelQuery.setCardNo(null); | |
| 162 | - personModels = personService.queryPersons(personModelQuery); | |
| 163 | - } | |
| 158 | +// if (personModels == null || personModels.size() == 0) | |
| 159 | +// { | |
| 160 | +// personModelQuery.setPhone(yunRequest.getPregnantPhone()); | |
| 161 | +// personModelQuery.setCardNo(null); | |
| 162 | +// personModels = personService.queryPersons(personModelQuery); | |
| 163 | +// } | |
| 164 | 164 | |
| 165 | 165 | |
| 166 | 166 | PersonModel pmodel = new PersonModel(); |
| ... | ... | @@ -410,6 +410,19 @@ |
| 410 | 410 | |
| 411 | 411 | Patients patient = getPatientsData(yunRequest); |
| 412 | 412 | patient.setModified(new Date()); |
| 413 | + | |
| 414 | +// Integer type = ServiceObjEnums.YUNOBJ.getId(); | |
| 415 | +// if (patient.getLastMenses() != null) | |
| 416 | +// { | |
| 417 | +// Date date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()),42); | |
| 418 | +// Date currentDate = DateUtil.formatDate(new Date()); | |
| 419 | +// if (date.getTime() <= currentDate.getTime()) | |
| 420 | +// { | |
| 421 | +// type = ServiceObjEnums.CHANOBJ.getId(); | |
| 422 | +// } | |
| 423 | +// } | |
| 424 | +// patient.setType(type); | |
| 425 | + | |
| 413 | 426 | |
| 414 | 427 | if (!StringUtils.isEmpty(yunRequest.getPid())) |
| 415 | 428 | { |