diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 1fbb660..8890dcb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -40,7 +40,7 @@ public class AntenatalExaminationController extends BaseController { @TokenRequired public BaseResponse queryAntenatalExamination(@Valid AntenatalExaminationQueryRequest antenatalExaminationQueryRequest) { if (StringUtils.isEmpty(antenatalExaminationQueryRequest.getCardNo()) && StringUtils.isEmpty(antenatalExaminationQueryRequest.getVcCardNo())) { - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件."); + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件"); } return antenatalExaminationFacade.queryAntenatalExamination(antenatalExaminationQueryRequest); } 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 8eb4f0e..f309d9b 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 @@ -92,45 +92,7 @@ public class MatDeliverFacade { } } - for (MatDeliverAddRequest.Baby baby : list) { - MaternalDeliverModel.Baby baby1 = baby.convertToDataModel(); - babyList.add(baby1); - - BabyModel babyModel = new BabyModel(); - baby.setId(baby1.getId()); - babyModel.setBirth(new Date()); - babyModel.setYn(YnEnums.YES.getId()); - babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId()); - babyModel.setAsphyxiaM(baby1.getAsphyxiaM()); - if (null != baby1.getBabyGender()) { - babyModel.setSex(Integer.valueOf(baby1.getBabyGender())); - } - babyModel.setApgarScore(baby1.getApgarScore()); - babyModel.setModified(new Date()); - babyModel.setBabyHealthy(baby1.getBabyHealthy()); - babyModel.setBabyWeight(com.lyms.platform.common.utils.StringUtils.cutBabyWeight(baby1.getBabyWeight())); - babyModel.setBabyHeight(baby1.getBabyHeight()); - babyModel.setMalformation(baby1.getDeformity()); - babyModel.setPregnancyOut(baby1.getPregnancyOut()); - babyModel.setContactM(baby1.getContactM()); - babyModel.setContactStartM(baby1.getContactStartM()); - babyModel.setEarlySuck(baby1.getEarlySuck()); - babyModel.setParentId(parentId); - babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); - babyModel.setYn(YnEnums.NO.getId()); - //判断妊娠结局是活产才添加数据 - if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { - babyModel.setYn(YnEnums.YES.getId()); - PersonModel personModel = new PersonModel(); - personModel.setType(2); - personModel.setYn(YnEnums.YES.getId()); - personModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate())); - personModel.setModified(new Date()); - babyModel.setPid(personService.addPerson(personModel).getId()); - } - babyIds.add(babyService.addOneBaby(babyModel).getId()); - } - maternalDeliverModel.setBaby(babyList); + handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName); } List list1 = autoMatchFacade.matchOrgId(userId); if (CollectionUtils.isNotEmpty(list1)) { @@ -172,6 +134,59 @@ public class MatDeliverFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + /** + * 处理儿童 + * + * @param deliverAddRequest + * @param babyList + * @param maternalDeliverModel + * @param list + * @param babyIds + * @param parentId + * @param userName + */ + private void handBaby(MatDeliverAddRequest deliverAddRequest, List babyList, MaternalDeliverModel maternalDeliverModel, List list, List babyIds, String parentId, String userName) { + for (MatDeliverAddRequest.Baby baby : list) { + MaternalDeliverModel.Baby baby1 = baby.convertToDataModel(); + babyList.add(baby1); + + BabyModel babyModel = new BabyModel(); + baby.setId(baby1.getId()); + babyModel.setBirth(new Date()); + babyModel.setYn(YnEnums.YES.getId()); + babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId()); + babyModel.setAsphyxiaM(baby1.getAsphyxiaM()); + if (null != baby1.getBabyGender()) { + babyModel.setSex(Integer.valueOf(baby1.getBabyGender())); + } + babyModel.setApgarScore(baby1.getApgarScore()); + babyModel.setModified(new Date()); + babyModel.setBabyHealthy(baby1.getBabyHealthy()); + babyModel.setBabyWeight(com.lyms.platform.common.utils.StringUtils.cutBabyWeight(baby1.getBabyWeight())); + babyModel.setBabyHeight(baby1.getBabyHeight()); + babyModel.setMalformation(baby1.getDeformity()); + babyModel.setPregnancyOut(baby1.getPregnancyOut()); + babyModel.setContactM(baby1.getContactM()); + babyModel.setContactStartM(baby1.getContactStartM()); + babyModel.setEarlySuck(baby1.getEarlySuck()); + babyModel.setParentId(parentId); + babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); + babyModel.setYn(YnEnums.NO.getId()); + //判断妊娠结局是活产才添加数据 + if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { + babyModel.setYn(YnEnums.YES.getId()); + PersonModel personModel = new PersonModel(); + personModel.setType(2); + personModel.setYn(YnEnums.YES.getId()); + personModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate())); + personModel.setModified(new Date()); + babyModel.setPid(personService.addPerson(personModel).getId()); + } + babyIds.add(babyService.addOneBaby(babyModel).getId()); + } + maternalDeliverModel.setBaby(babyList); + } + /** * 查询分娩记录信息