diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 9ec033a..988b4f3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -601,12 +601,16 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService public BaseObjectResponse health(String parentId, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); List> restList = new ArrayList<>(); - Patients p = mongoTemplate.findById(parentId, Patients.class); + Patients patients = mongoTemplate.findById(parentId, Patients.class); + if(patients == null) { + return RespBuilder.buildSuccess(); + } + Patients p = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients.getPid()).and("type").is(1)), Patients.class); if(p == null) { return RespBuilder.buildSuccess(); } - AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").is(1).and("type").is(1).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class); - List antexModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(p.getPid()).and("type").is(1).and("yn").is(1).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "checkDate")), AntenatalExaminationModel.class); + AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class); + List antexModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(p.getId()).and("yn").is(1).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "checkDate")), AntenatalExaminationModel.class); Map xyMap = new HashMap<>(); List szyMin = new ArrayList<>();