diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java index e8fcc99..fcce578 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java @@ -77,7 +77,7 @@ public class BabyBookbuildingService { } }else{ //子当 - babyModelQuery.setId(babyModel.getSource()); + babyModelQuery.setId(patients.getSource()); babyModelQuery.setYn(YnEnums.YES.getId()); patientses=queryBabyBuildByCond(babyModelQuery); if(CollectionUtils.isNotEmpty(patientses)){ @@ -85,8 +85,7 @@ public class BabyBookbuildingService { babyModel.setId(patients1.getId()); babyModel.setHospitalId(patients1.getHospitalId()); babyModel.setCreated(patients1.getCreated()); - updateBabyBuild(babyModel,babyModel.getId()); - patientsService.updateRefer(babyModel); + updateBabyBuild(babyModel, babyModel.getId()); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index fe0543e..9607409 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -69,7 +69,7 @@ public class BabyCheckFacade { * @param request * @return */ - public BaseResponse updateBabyCheck(BabyCheckRequest request,Integer userId) { + public BaseResponse updateBabyCheck(BabyCheckRequest request, Integer userId) { BabyCheckModel model = getBabyCheckModel(request); model.setModified(new Date()); @@ -99,13 +99,13 @@ public class BabyCheckFacade { bm.setLastDiagnose(diagnoseNames); } babyBookbuildingService.updateBabyBuild(bm, request.getBuildId()); - BabyModelQuery babyModelQuery=new BabyModelQuery(); + BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setId(request.getBuildId()); - List list =babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); - if(CollectionUtils.isNotEmpty(list)){ + List list = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + if (CollectionUtils.isNotEmpty(list)) { bm.setPid(list.get(0).getPid()); bm.setId(request.getBuildId()); - if(autoMatchFacade.checkBStatus(userId)){ + if (autoMatchFacade.checkBStatus(userId)) { babyBookbuildingService.updateBaseData(bm); } } @@ -330,26 +330,26 @@ public class BabyCheckFacade { babyModel = babyModels.get(0); } //表示这个记录是子档 - if(babyModel!=null&&org.apache.commons.lang.StringUtils.isNotEmpty(babyModel.getSource())){ - BabyModel babyModel1=new BabyModel(); + if (babyModel != null && org.apache.commons.lang.StringUtils.isNotEmpty(babyModel.getSource())) { + BabyModel babyModel1 = new BabyModel(); babyModel1.setNextDate(babyModel.getNextDate()); babyModel1.setLastHighRisk(babyModel.getLastHighRisk()); babyModel1.setLastDiagnose(babyModel.getLastDiagnose()); babyModel1.setId(babyModel.getSource()); - babyBookbuildingService.updateBabyBuild(babyModel1,babyModel.getSource()); - }else if(babyModel!=null){ + babyBookbuildingService.updateBabyBuild(babyModel1, babyModel.getSource()); + } else if (babyModel != null) { babyModelQuery.setId(null); babyModelQuery.setSource(id); babyModelQuery.setYn(YnEnums.YES.getId()); babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); - if(CollectionUtils.isNotEmpty(babyModels)){ - for(BabyModel baby:babyModels){ - BabyModel babyModel1=new BabyModel(); + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel baby : babyModels) { + BabyModel babyModel1 = new BabyModel(); babyModel1.setNextDate(babyModel.getNextDate()); babyModel1.setLastHighRisk(babyModel.getLastHighRisk()); babyModel1.setLastDiagnose(babyModel.getLastDiagnose()); babyModel1.setId(baby.getId()); - babyBookbuildingService.updateBabyBuild(babyModel1,baby.getId()); + babyBookbuildingService.updateBabyBuild(babyModel1, baby.getId()); } } }