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 fde9fab..9e5d3b6 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 @@ -48,6 +48,15 @@ public class MatDeliverFacade { @Autowired private PersonService personService; + private static Map ONE_ENUMS= new HashMap<>(); + static { + ONE_ENUMS.put(3,"三"); + ONE_ENUMS.put(4,"四"); + ONE_ENUMS.put(5,"五"); + ONE_ENUMS.put(6,"六"); + ONE_ENUMS.put(7,"七"); + } + /** * 增加或者修改分娩记录 * @@ -192,6 +201,39 @@ public class MatDeliverFacade { return babyModel; } + + private List buildBabyName(List list) { + Map babyMap = new HashMap<>(); + List b1 = new ArrayList<>(); + b1.add("长女"); + b1.add("次女"); + babyMap.put("00", b1); + + List b2 = new ArrayList<>(); + b2.add("长子"); + b2.add("次子"); + babyMap.put("11", b2); + + List b3 = new ArrayList<>(); + b3.add("之子"); + b3.add("之女"); + + List b4 = new ArrayList<>(); + b4.add("之女"); + b4.add("之子"); + babyMap.put("01", b4); + babyMap.put("10", b3); + + String id=""; + for (int i = 0; i < list.size() && i <= 2; i++) { + MatDeliverAddRequest.Baby baby = list.get(i); + if(StringUtils.isNotEmpty(baby.getBabyGender())){ + id+=baby.getBabyGender(); + } + } + return babyMap.get(id); + } + /** * 处理儿童 * @@ -204,6 +246,10 @@ public class MatDeliverFacade { * @param userName */ private void handBaby(MatDeliverAddRequest deliverAddRequest, List babyList, MaternalDeliverModel maternalDeliverModel, List list, List babyIds, String parentId, String userName, Patients patients) { + + + List babyName = buildBabyName(list); + int i =0; for (MatDeliverAddRequest.Baby baby : list) { MaternalDeliverModel.Baby baby1 = baby.convertToDataModel(); babyList.add(baby1); @@ -232,6 +278,11 @@ public class MatDeliverFacade { babyModel.setEarlySuck(baby1.getEarlySuck()); babyModel.setParentId(parentId); babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); + if(CollectionUtils.isNotEmpty(babyName)&&i2){ + babyModel.setName(userName + ONE_ENUMS.get(i) + (babyModel.getSex() == 1 ? "子" : "女")); + } babyModel.setYn(YnEnums.NO.getId()); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getMcertNo())) { @@ -259,6 +310,7 @@ public class MatDeliverFacade { babyModel.setPid(personService.addPerson(personModel).getId()); } babyIds.add(babyService.addOneBaby(babyModel).getId()); + i++; } maternalDeliverModel.setBaby(babyList); } @@ -282,25 +334,24 @@ public class MatDeliverFacade { return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); }*/ //外院的孕妇 - Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1,false); + Patients patients1 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 1, false); //外院的产妇 // Patients patients2 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, null, 3); //http://jira.healthbaby.com.cn/browse/WEB-204 修改bug //本院的孕妇 - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1,false); + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 1, false); //本院产妇 - Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3,false); + Patients patients3 = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, 3, false); //本院产妇,并且本院没建档需要提醒补录记录 - if(null!=patients3 && null==patients){ - patients=patients3; + if (null != patients3 && null == patients) { + patients = patients3; //外院的孕妇在本院没有建档需要提醒建档 - }else if (null != patients1 && null == patients) { + } else if (null != patients1 && null == patients) { return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); } - MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setPid(patients.getPid()); matDeliverQuery.setYn(YnEnums.YES.getId());