diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java index 53d9208..a3227f3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java @@ -1211,9 +1211,10 @@ public class StatisticsController extends BaseController { @TokenRequired public BaseResponse xtStatisticsList(HttpServletRequest request, String startTime,String endTime, - Integer id,Integer page,Integer limit){ + Integer type,Integer page,Integer limit, + String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return bloodSugarService.getXtStatisticsList(loginState.getId(),startTime,endTime,id,page,limit); + return bloodSugarService.getXtStatisticsList(loginState.getId(),startTime,endTime,type,page,limit,key,vcCardNo,weekStart,weekEnd,age); } @RequestMapping(value = "/yjStatistics", method = RequestMethod.GET) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java index 8893c24..c4eefd9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java @@ -46,5 +46,5 @@ public interface IBloodSugarService extends IBaseService { BaseResponse getDoctorWx(String patientId); BaseResponse getXtStatistics(Integer userId,String startTime,String endTime); - BaseResponse getXtStatisticsList(Integer userId,String startTime,String endTime,Integer id,Integer page,Integer limit); + BaseResponse getXtStatisticsList(Integer userId,String startTime,String endTime,Integer id,Integer page,Integer limit,String key,String vcCardNo,Integer weekStart,Integer weekEnd,Integer age); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index 4f5b0a8..27c8bea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -1822,10 +1822,18 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga @Override public BaseResponse getXtStatisticsList(Integer userId, String startTime, String endTime, Integer id, - Integer page,Integer limit) { + Integer page,Integer limit,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age) { String hospitalId= autoMatchFacade.getHospitalId(userId); Criteria criteria = Criteria.where("hospitalId").is(hospitalId); criteria.and("yn").is(1); + boolean flag = false; + if (StringUtils.isNotEmpty(key) || StringUtils.isNotEmpty(vcCardNo) || weekEnd != null || weekStart != null || age != null) { + flag = true; + } + //List hospitalIds = groupsFacade.findGroupHospital(userId, false); + List hids = new ArrayList<>(); + hids.add(hospitalId); + if (id!=null){ //1正常血糖管理、2低血糖管理、3高血糖管理 criteria.and("sugarType").is(id); @@ -1833,6 +1841,10 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga if (startTime!=null && endTime!=null){ criteria.and("created").gte(DateUtil.parseYMDHMS(startTime+" 00:00:00")).lte(DateUtil.parseYMDHMS(endTime+" 23:59:59")); } + if (flag) { + List pids = mongoUtil.getPidsByCondition2(hids, key, vcCardNo, weekStart, weekEnd, age); + criteria.and("pid").in(pids); + } Query query = Query.query(criteria).with(new Sort(Sort.Direction.DESC, "created")); PageResult pageResult = findMongoPage(BloodSugarStatistics.class, query, page, limit); List bloodSugars = (List) pageResult.getGrid();