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 96448ae..e61bc6e 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 @@ -70,9 +70,8 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) { List hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId); Criteria criteria = Criteria.where("yn").is(1).and("hospitalId").in(hospitalIds); - List patientIds = mongoUtil.getPatientIdsByCondition2(hospitalIds, key, vcCardNo, weekStart, weekEnd, age); - System.out.println(patientIds); - criteria.and("parentId").in(patientIds); + List pids = mongoUtil.getPidsByCondition2(hospitalIds, key, vcCardNo, weekStart, weekEnd, age); + criteria.and("pid").in(pids); PageResult pageResult = findMongoPage(BloodSugar.class, Query.query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List bloodSugars = (List) pageResult.getGrid(); List> restList = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java index 4d0659b..85a71a5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java @@ -636,12 +636,12 @@ public class MongoUtil { return ids; } - public List getPatientIdsByCondition2(List hospitalIds, String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age) { + public List getPidsByCondition2(List hospitalIds, String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age) { List patients = getPatientByCondition2(hospitalIds, key, vcCardNo, weekStart, weekEnd, age); List ids = new ArrayList<>(); if(CollectionUtils.isNotEmpty(patients)) { for (Patients patient : patients) { - ids.add(patient.getId()); + ids.add(patient.getPid()); } } return ids;