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 2153918..aba2038 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 @@ -1121,6 +1121,7 @@ public class MatDeliverFacade { /** * 分娩后随访列表数据 + * * @param MatdeliverFollowRequest * @return */ @@ -1145,7 +1146,7 @@ public class MatDeliverFacade { hospitalList.add(MatdeliverFollowRequest.getHospitalId()); } else { - if(StringUtils.isNotEmpty(MatdeliverFollowRequest.getHospitalId())){ + if (StringUtils.isNotEmpty(MatdeliverFollowRequest.getHospitalId())) { hospitalList.add(MatdeliverFollowRequest.getHospitalId()); } @@ -1190,7 +1191,7 @@ public class MatDeliverFacade { // 没有查到,直接抛出 return listResponse; } - Map patientsMap = new HashMap<>(); + Map patientsMap = new HashMap<>(); for (Patients patients : patientsList) { parentIdList.add(patients.getId()); MatdeliverFollowListResult matdeliverFollowListResult = new MatdeliverFollowListResult(); @@ -1215,7 +1216,7 @@ public class MatDeliverFacade { matDeliverQuery.setYn(YnEnums.YES.getId()); List maternalDeliverModelList = matDeliverService.query(matDeliverQuery); - for(MaternalDeliverModel deliverModel : maternalDeliverModelList){ + for (MaternalDeliverModel deliverModel : maternalDeliverModelList) { MatdeliverFollowListResult matdeliverFollowListResult = patientsMap.get(deliverModel.getParentId()); //最后一次随访Id @@ -1237,30 +1238,38 @@ public class MatDeliverFacade { //分娩医院 matdeliverFollowListResult.setFmHospital(organization.getName()); //预约联系结果 - if(deliverModel.getContactResult()!=null){ + if (deliverModel.getContactResult() != null) { matdeliverFollowListResult.setContactResult(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getContactResult())); } //产妇确认结果 - if(deliverModel.getVisitAffirm()!=null){ + if (deliverModel.getVisitAffirm() != null) { matdeliverFollowListResult.setVisitAffirm(PostpartumFollowMakeEnums.VisitAffirmEnum.getTitle(deliverModel.getVisitAffirm())); } - //访视结果 - if(deliverModel.getVisitResult()!=null){ - matdeliverFollowListResult.setVisitResult(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getVisitResult())); - } + //访视类型 - if(deliverModel.getMakeType()!=null){ + if (deliverModel.getMakeType() != null) { matdeliverFollowListResult.setMakeType(PostpartumFollowMakeEnums.TypeEnum.getTitle(deliverModel.getMakeType())); } - //下次访视时间 - if(deliverModel.getNextVisitDate()!=null){ - matdeliverFollowListResult.setNextVisitDate(DateUtil.getyyyy_MM_dd(deliverModel.getNextVisitDate())); - } - //访视是否结案 - if(deliverModel.getIsClose()!=null){ + //访视是否结案,如果已经结案则返回已结案,如果未结案,显示下次访视时间 + if (deliverModel.getIsClose() != null && deliverModel.getIsClose() == PostpartumFollowMakeEnums.IsCloseEnum.YJA.getId()) { matdeliverFollowListResult.setNextVisitDate(PostpartumFollowMakeEnums.IsCloseEnum.getTitle(deliverModel.getIsClose())); + } else { + //下次访视时间 + if (deliverModel.getNextVisitDate() != null) { + matdeliverFollowListResult.setNextVisitDate(DateUtil.getyyyy_MM_dd(deliverModel.getNextVisitDate())); + } + } + //访视状态 + if (deliverModel.getVisitStatus() != null && deliverModel.getVisitStatus() == 1) { + matdeliverFollowListResult.setVisitResult("待访视"); } + //访视结果 + if (deliverModel.getVisitResult() != null) { + matdeliverFollowListResult.setVisitResult(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getVisitResult())); + } + + matdeliverFollowListResults.add(matdeliverFollowListResult); } listResponse.setPageInfo(patientsQuery.getPageInfo()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index 0ca70f7..184fbf5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -132,7 +132,24 @@ public class MatdeliverFollowFacade { matDeliverFollowAddRequest.setUpdateDateStr(new Date()); matDeliverFollowAddRequest.setUpdateUser(String.valueOf(userId)); + + if(matDeliverFollowAddRequest.getVisitResult()!=null&&matDeliverFollowAddRequest.getVisitResult() == 1){//访视成功,默认设置待确认 + //产妇随访确认 为待确认 + matDeliverFollowAddRequest.setVisitAffirm(1); + } + + //预约成功,但访问状态还是null则就是待访视状态 + if(matDeliverFollowAddRequest.getContactResult() == 1&&matDeliverFollowAddRequest.getVisitResult() == null){ + matDeliverFollowAddRequest.setVisitStatus(1); + } + //有访视结果时,则就是已访视状态 + if(matDeliverFollowAddRequest.getVisitResult() != null){ + matDeliverFollowAddRequest.setVisitStatus(2); + } + if (StringUtils.isNotEmpty(matDeliverFollowAddRequest.getId())) {//修改 + matDeliverFollowAddRequest.setMakeCreateUser(null); + matDeliverFollowAddRequest.setMakeCreateDate(null); //修改随访信息 matDeliverFollowService.updateOne(matDeliverFollowAddRequest.convertToDataModel(), matDeliverFollowAddRequest.getId()); @@ -141,6 +158,7 @@ public class MatdeliverFollowFacade { //如果修改的是最后一次随访记录,则进行同步修改分娩记录里的随访信息 if (matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())) { + //在分娩记录上记录随访部分信息 maternalDeliverModel.setContactResult(matDeliverFollowAddRequest.getContactResult()); maternalDeliverModel.setContactReason(matDeliverFollowAddRequest.getContactReason()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 955b401..0461b74 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2347,6 +2347,7 @@ public class ViewFacade { String loseBloodCause = ""; if (StringUtils.isNotEmpty(data.getLoseBloodCause())) { String loseBloodCauseJson = data.getLoseBloodCause(); + Map loseBloodCauseMap = JsonUtil.getMap(loseBloodCauseJson); if (MapUtils.isNotEmpty(loseBloodCauseMap) && StringUtils.isNotEmpty(loseBloodCauseMap.get("select"))) { for (SXCauseEnums sxCauseEnums : SXCauseEnums.values()) {