diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java index b55a08a..9d906bd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java @@ -15,8 +15,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Date; -import java.util.HashMap; -import java.util.Map; /** * 追访 @@ -41,7 +39,7 @@ public class TrackDownController extends BaseController { } - /** + /** 追访概况查看追访详情 * @param parentId * @param trackType 产考TrackDownDateEnums里面的值 0代表所有 * @return @@ -53,7 +51,7 @@ public class TrackDownController extends BaseController { return trackDownService.info(parentId, trackType,buildType); } - /** + /** 其他追访模块查看追访详情 * @param parentId * @param trackType 产考TrackDownDateEnums里面的值 0代表所有 * @return @@ -71,13 +69,14 @@ public class TrackDownController extends BaseController { return trackDownService.init(); } + /** + * 获取追访概况数据 + * @return + */ @ResponseBody @TokenRequired @RequestMapping(value = "/all", method = RequestMethod.GET) public BaseResponse all(Date buildStart, Date buildEnd, Date checkStart, Date checkEnd, Date fmStart, Date fmEnd, String key,Integer type, @RequestParam Integer page, @RequestParam Integer limit, HttpServletRequest request) { - Map map = new HashMap<>(); - - // downFacade.all(map); return trackDownService.all(buildStart, buildEnd, checkStart, checkEnd, fmStart, fmEnd, key, page, limit, getUserId(request),type); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 89c5e50..c0479e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -213,7 +213,7 @@ public class TrackDownFacade { //产后复查次数 map.put("fcCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1)), PostReviewModel.class)); //产前检查次数(初诊+复诊) - map.put("checkCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("hospitalId").is(hospitalId).and("yn").is(1)), AntenatalExaminationModel.class) + mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1)), AntExChuModel.class)); + map.put("checkCount", getChuzhenCount(parentId) ); //复诊 @@ -250,6 +250,16 @@ public class TrackDownFacade { return RespBuilder.buildSuccess(map); } + + /** + * 获取产检次数 + */ + private long getChuzhenCount(String parentId) { + long antexcCount = mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1)), AntExChuModel.class); + long antexCount = mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1)), AntenatalExaminationModel.class); + return antexcCount + antexCount; + } + /** * 获取追访列表 * @@ -470,7 +480,7 @@ public class TrackDownFacade { } } //产检次数 - temp.put("checkCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("hospitalId").is(hospitalId).and("yn").is(1)), AntenatalExaminationModel.class) + mongoTemplate.count(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1)), AntExChuModel.class)); + temp.put("checkCount", getChuzhenCount(parentId)); Criteria criteria = Criteria.where("yn").is(1).and("parentId").is(downRecord.getParentId()); if (TrackDownDateEnums.C.getId() == downRecord.getTrackType()) { criteria.and("trackDownDateType").in(3, 9); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 4e20a9e..6360b2d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -395,7 +395,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS */ private long getChuzhenCount(String patientId) { long antexcCount = mongoTemplate.count(Query.query(Criteria.where("parentId").is(patientId).and("yn").is(1)), AntExChuModel.class); - long antexCount = mongoTemplate.count(Query.query(Criteria.where("parentid").is(patientId).and("yn").is(1)), AntenatalExaminationModel.class); + long antexCount = mongoTemplate.count(Query.query(Criteria.where("parentId").is(patientId).and("yn").is(1)), AntenatalExaminationModel.class); return antexcCount + antexCount; }