diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 14c682b..1574681 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -480,7 +480,7 @@ public class BabyBookbuildingFacade { // 更新追访概况,作废档案转正 babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_STATISTICS, STATUS_TYPE_BUILD); - babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_BUILD, STATUS_TYPE_NO); + //babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_BUILD, STATUS_TYPE_NO); // 新增儿保追访和眼保追访 babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_CHECK, STATUS_TYPE_YES); babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_EYE_CHECK, STATUS_TYPE_YES); @@ -774,6 +774,13 @@ public class BabyBookbuildingFacade { operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), model, OptActionEnums.ADD.getId(), "儿童建档"); model = babyBookbuildingService.addBabyBookbuilding(model); + // 更新追访概况,作废档案转正 + babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_STATISTICS, STATUS_TYPE_BUILD); + babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_BUILD, STATUS_TYPE_NO); + // 新增儿保追访和眼保追访 + babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_CHECK, STATUS_TYPE_YES); + babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_EYE_CHECK, STATUS_TYPE_YES); + //开通增值服务 PatientService patientService = new PatientService(); patientService.setPerType(2); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java index 8138423..c6e8f73 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java @@ -124,6 +124,12 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { Map objectMap = BeanUtils.objectToObjectMap(model); objectMap.put("sexStr", SexEnum.getTextById(model.getSex())); objectMap.put("birthStr", DateUtil.getyyyy_MM_dd(model.getBirth())); + highRiskType = model.getHighRiskType(); + if (highRiskType == 1) { + boolean exists = mongoTemplate.exists(Query.query(Criteria.where("_id").is(model.getBabyId()).and("dataStatus").exists(true)), BabyModel.class); + highRiskType = exists ? -1 : highRiskType; + } + objectMap.put("highRiskType", highRiskType); mapList.add(objectMap); } @@ -758,6 +764,11 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { boolean exists = mongoTemplate.exists(Query.query(Criteria.where(BABY_ID).is(babyModelId).and("highRiskType").ne(STATUS_TYPE_BUILD)), BabyAfterVisitStatisticsModel.class); if (exists) { mongoTemplate.updateFirst(query, Update.update("highRiskType", STATUS_TYPE_BUILD), BabyAfterVisitStatisticsModel.class); + } else { + // 新增数据 + Future> listFuture = service.submit(new BabyAfterVisitStatisticsModelWork(models, mongoTemplate, screenMapper)); + List statisticsModels = listFuture.get(); + mongoTemplate.insert(statisticsModels, BabyAfterVisitStatisticsModel.class); } } // 预建档/临时建档