diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyAfterVisitController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyAfterVisitController.java index d3454c9..ecf4b75 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyAfterVisitController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyAfterVisitController.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.concurrent.ExecutionException; @@ -59,8 +60,8 @@ public class BabyAfterVisitController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/afterVisit/list") @ResponseBody @TokenRequired - private BaseResponse getAfterVisitListPage(@RequestBody @Valid BabyAfterVisitRequest request) { - return babyAfterVisitService.getAfterVisitListPage(request); + private BaseResponse getAfterVisitListPage(@RequestBody @Valid BabyAfterVisitRequest request, HttpServletRequest req) { + return babyAfterVisitService.getAfterVisitListPage(request,getUserId(req)); } /** @@ -72,8 +73,8 @@ public class BabyAfterVisitController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/build/list") @ResponseBody @TokenRequired - private BaseResponse getBuildListPage(@RequestBody @Valid BabyAfterVisitBuildListRequest request) { - return babyAfterVisitService.getBuildListPage(request); + private BaseResponse getBuildListPage(@RequestBody @Valid BabyAfterVisitBuildListRequest request, HttpServletRequest req) { + return babyAfterVisitService.getBuildListPage(request, getUserId(req)); } /** 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 b0aa4d3..969eddc 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 @@ -529,6 +529,8 @@ public class BabyCheckFacade extends BaseServiceImpl { } else { babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_CHECK, STATUS_TYPE_UPDATE); } + bm.setId(request.getBuildId()); + babyAfterVisitService.addOrUpdateAfterVisitData(bm, TYPE_STATISTICS, STATUS_TYPE_CHECK); operateLogFacade.addAddOptLog(userId, Integer.valueOf(hospitalId), model, OptActionEnums.ADD.getId(), "添加儿童检查"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyAfterVisitService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyAfterVisitService.java index bf707a4..f5f047a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyAfterVisitService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyAfterVisitService.java @@ -56,7 +56,7 @@ public interface BabyAfterVisitService { * @param request * @return */ - BaseResponse getAfterVisitListPage(BabyAfterVisitRequest request); + BaseResponse getAfterVisitListPage(BabyAfterVisitRequest request, Integer userId); /** * 初始化同步儿童追访统计表数据 @@ -67,12 +67,12 @@ public interface BabyAfterVisitService { BaseResponse syncInitStatistics(String babyId, String startTime, String endTime) throws ExecutionException, InterruptedException; /** - * 档案转正列表 + * 档案转正列表/儿保检查/眼保检查/听力筛查 * * @param request * @return */ - BaseResponse getBuildListPage(BabyAfterVisitBuildListRequest request); + BaseResponse getBuildListPage(BabyAfterVisitBuildListRequest request, Integer userId); /** * 档案转正/儿保检查/眼保检查/听力筛查 - 新增追访记录 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 27e1b2d..8138423 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 @@ -11,6 +11,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseModel; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.request.BabyAfterVisitBuildListRequest; import com.lyms.platform.operate.web.request.BabyAfterVisitInfoDetailListRequest; import com.lyms.platform.operate.web.request.BabyAfterVisitInfoDetailRequest; @@ -57,6 +58,9 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { @Autowired private MasterUsersMapper usersMapper; + @Autowired + private AutoMatchFacade autoMatchFacade; + /** * 追访管理 - 追访列表 * @@ -64,9 +68,11 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { * @return */ @Override - public BaseResponse getAfterVisitListPage(BabyAfterVisitRequest request) { + public BaseResponse getAfterVisitListPage(BabyAfterVisitRequest request, Integer userId) { String querNo = request.getQuerNo(); Query query = new Query(); + String hospitalId = autoMatchFacade.getHospitalId(userId); + query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); // 查询号 姓名、证件号、手机号 if (StringUtils.isNotEmpty(querNo)) { @@ -273,13 +279,13 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { /** - * 档案转正列表 + * 档案转正列表/儿保检查/眼保检查/听力筛查 * * @param request * @return */ @Override - public BaseResponse getBuildListPage(BabyAfterVisitBuildListRequest request) { + public BaseResponse getBuildListPage(BabyAfterVisitBuildListRequest request, Integer userId) { String type = request.getType(); boolean isOk = checkOverdueDataByType(type); if (!isOk) { @@ -287,6 +293,8 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { } Query query = new Query(); + String hospitalId = autoMatchFacade.getHospitalId(userId); + query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); if (Objects.isNull(type)) { return new BaseResponse("参数缺失", ErrorCodeConstants.PARAMETER_ERROR); } @@ -770,7 +778,12 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { } // 更新眼保数量 if (Objects.equals(STATUS_TYPE_EYE_CHECK, statusType)) { - + BabyAfterVisitStatisticsModel one = mongoTemplate.findOne(Query.query(Criteria.where(BABY_ID).is(babyModelId)), BabyAfterVisitStatisticsModel.class); + if (one != null) { + Integer eyeCheckSize = one.getEyeCheckSize(); + eyeCheckSize ++; + mongoTemplate.updateFirst(Query.query(Criteria.where(BABY_ID).is(babyModelId)), Update.update("eyeCheckSize", eyeCheckSize), BabyAfterVisitStatisticsModel.class); + } } logger.info("已更新到追访概况中"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 856249d..fbd889b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -109,6 +109,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye } else { babyAfterVisitService.addOrUpdateAfterVisitData(babyEyeCheck, TYPE_EYE_CHECK, STATUS_TYPE_UPDATE); } + BabyModel model = new BabyModel(); + model.setId(babyEyeCheck.getBabyId()); + babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_STATISTICS, STATUS_TYPE_EYE_CHECK); if(CollectionUtils.isNotEmpty(babyEyeCheck.getRiskFactorId())) { String riskFactor = org.apache.commons.lang3.StringUtils.join(babyEyeCheck.getRiskFactorId().toArray(), ",");