diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index 31a4403..00c98bd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -100,16 +100,6 @@ public class BabyEarFacade { //处理儿童person信息 private PersonModel handBabyPerson(BabyModel baby) { - //跟距母親的證件號查詢兒童person信息 - PersonModelQuery personModelQuery = new PersonModelQuery(); - personModelQuery.setYn(YnEnums.YES.getId()); - personModelQuery.setCardNo(baby.getMcertNo()); - personModelQuery.setType(2); - personModelQuery.setName(baby.getName()); - List babyP = personService.queryPersons(personModelQuery); - if (CollectionUtils.isNotEmpty(babyP)) { - return babyP.get(0); - } PersonModel babyPerson = new PersonModel(); babyPerson.setName(baby.getName()); babyPerson.setBirth(baby.getBirth()); @@ -379,8 +369,28 @@ public class BabyEarFacade { String hId = autoMatchFacade.getHospitalId(userId); if (null != baby) { - //处理儿童person信息 - String pid = handBabyPerson(baby).getId(); + String pid = null; + if(StringUtils.isNotEmpty(baby.getId())){//修改儿童信息 + BabyModel babyModel = babyService.getOneBabyById(baby.getId()); + //跟距母親的證件號查詢兒童person信息 + PersonModelQuery personModelQuery = new PersonModelQuery(); + personModelQuery.setId(babyModel.getPid()); + List babyP = personService.queryPersons(personModelQuery); + if (CollectionUtils.isNotEmpty(babyP)) { + PersonModel personModel = babyP.get(0); + personModel.setName(baby.getName()); + personModel.setBirth(baby.getBirth()); + personModel.setPhone(baby.getName()); + personModel.setCardNo(baby.getMcertNo()); + personModel.setModified(new Date()); + pid = personModel.getId(); + personService.updatePerson(personModel,personModel.getId()); + } + }else{//新增儿童信息 + //处理儿童person信息 + pid = handBabyPerson(baby).getId(); + } + babyEarAddResult.setpId(pid); String babyPatientId = "";