diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PersonModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PersonModel.java index b6351fa..98b6ceb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PersonModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PersonModel.java @@ -32,7 +32,7 @@ public class PersonModel extends BaseModel { //生日 private Date birth; - //类型 1 孕妇 2 儿童 + //类型 1 孕妇 2 儿童 3孕妇 private Integer type; private Date created; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index dcf9e87..0b4ecac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -69,16 +69,25 @@ public class MatDeliverFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(parentId); List patients = patientsService.queryPatient(patientsQuery); - + Patients patients1 =null; if (CollectionUtils.isNotEmpty(list)) { String userName = ""; if (CollectionUtils.isNotEmpty(patients)) { - userName = patients.get(0).getUsername(); + patients1=patients.get(0); + userName =patients1 .getUsername(); if (null != deliverAddRequest.getDueDate()) { Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate()); - patients.get(0).setFmDate(fmDate); - patients.get(0).setType(3); - patientsService.updatePatient(patients.get(0)); + patients1.setFmDate(fmDate); + patients1.setType(3); + patientsService.updatePatient(patients1); + //修改person表状态为产妇 + if(StringUtils.isNotEmpty(patients1.getPid())){ + PersonModel personModel=new PersonModel(); + personModel.setType(3); + personModel.setId(patients1.getPid()); + personModel.setModified(new Date()); + personService.updatePerson(personModel,patients1.getPid()); + } } } for (MatDeliverAddRequest.Baby baby : list) {