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 11c1d25..78550cd 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 @@ -5,12 +5,10 @@ import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.Assert; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.operate.web.request.MatDeliverQueryRequest; -import com.lyms.platform.operate.web.result.AntenatalExaminationResult; import com.lyms.platform.operate.web.result.MatDeliverListResult; import com.lyms.platform.operate.web.result.MaternalDeliverResult; import com.lyms.platform.permission.model.Organization; @@ -60,7 +58,7 @@ public class MatDeliverFacade { * @param deliverAddRequest * @return */ - public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest,Integer userId) { + public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest, Integer userId) { //增加 if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel(); @@ -82,25 +80,27 @@ public class MatDeliverFacade { patientsService.updatePatient(patients.get(0)); } } - for (MatDeliverAddRequest.Baby baby : list) { - BabyModel babyModel = baby.convertToDataModel(); - babyModel.setParentId(parentId); - babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); - babyModel.setYn(YnEnums.YES.getId()); + //判断妊娠结局是活产才添加数据 + if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { + BabyModel babyModel = baby.convertToDataModel(); + babyModel.setParentId(parentId); + babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); + 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()); + 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()); + } } } - List list1 = autoMatchFacade.matchOrgId(userId); - if(CollectionUtils.isNotEmpty(list1)){ - maternalDeliverModel.setHospitalId(list1.get(0)+""); + List list1 = autoMatchFacade.matchOrgId(userId); + if (CollectionUtils.isNotEmpty(list1)) { + maternalDeliverModel.setHospitalId(list1.get(0) + ""); } maternalDeliverModel.setBaby(babyIds); maternalDeliverModel.setYn(YnEnums.YES.getId()); @@ -149,7 +149,7 @@ public class MatDeliverFacade { */ public BaseResponse queryMatDeliver(MatDeliverQueryRequest deliverQueryRequest) { //获取 - Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(),null); + Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null); if (null == patients) { return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); } @@ -159,37 +159,37 @@ public class MatDeliverFacade { List list = matDeliverService.query(matDeliverQuery); MatDeliverListResult matDeliverListResult = new MatDeliverListResult(); matDeliverListResult.convertToResult(list, patients); - AntExQuery antExQuery=new AntExQuery(); + AntExQuery antExQuery = new AntExQuery(); antExQuery.setParentId(patients.getId()); antExQuery.setYn(YnEnums.YES.getId()); List examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); try { - String tTireNumber=""; + String tTireNumber = ""; List data = new ArrayList(); - if(CollectionUtils.isNotEmpty(examinationModel)){ - if(null!=examinationModel&&StringUtils.isNotEmpty(examinationModel.get(0).getRiskFactor())){ - tTireNumber=examinationModel.get(0).getTireNumber(); - List l = JsonUtil.toList(examinationModel.get(0).getRiskFactor(),List.class); - for(int i=0;i antExChuModels= antenatalExaminationService.queryAntExChu(antExChuQuery); - if(CollectionUtils.isNotEmpty(antExChuModels)){ - tTireNumber=antExChuModels.get(0).getTireNumber(); - List l = JsonUtil.toList(antExChuModels.get(0).getHighrisk(),List.class); - for(int i=0;i antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChuModels)) { + tTireNumber = antExChuModels.get(0).getTireNumber(); + List l = JsonUtil.toList(antExChuModels.get(0).getHighrisk(), List.class); + for (int i = 0; i < l.size(); i++) { + String key = (String) l.get(i); + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(key); + if (null != basicConfig) { data.add(basicConfig.getName()); } } @@ -198,7 +198,8 @@ public class MatDeliverFacade { matDeliverListResult.setRiskFactor(data); matDeliverListResult.setTireNumber1(tTireNumber); - }catch (Exception e){} + } catch (Exception e) { + } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(matDeliverListResult); } @@ -261,19 +262,19 @@ public class MatDeliverFacade { map.put("getTaiPan", getTaiPan()); map.put("getQidaiYc", getQidaiYc()); map.put("getRenShenJieJuEnums", getRenShenJieJuEnums()); - map.put("organizations",convert()); - map.put("cTime",DateUtil.getyyyy_MM_dd(new Date())); + map.put("organizations", convert()); + map.put("cTime", DateUtil.getyyyy_MM_dd(new Date())); return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - private List convert(){ + private List convert() { List organization = organizationService.queryHospital(); List data = new ArrayList(); - if(CollectionUtils.isNotEmpty(organization)){ - for(Organization org:organization){ + if (CollectionUtils.isNotEmpty(organization)) { + for (Organization org : organization) { Map map = new HashMap(); - map.put("id",org.getId()); - map.put("name",org.getName()); + map.put("id", org.getId()); + map.put("name", org.getName()); data.add(map); } } @@ -411,6 +412,7 @@ public class MatDeliverFacade { } return list; } + //脐带异常类型 public List getQidaiYc() { List list = new ArrayList<>(); @@ -422,6 +424,7 @@ public class MatDeliverFacade { } return list; } + //妊娠结局 public List getRenShenJieJuEnums() { List list = new ArrayList<>();