diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums.java index 63a6936..45e0d24 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums.java @@ -5,7 +5,7 @@ package com.lyms.platform.common.enums; */ public enum BloodSugarEnums { - A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后2h"), D(4, "午餐前"), E(5, "午餐后2h"), F(6, "晚餐前"), G(7, "晚餐后2h"), H(8, "夜间"), I(9, "睡前"); + A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后2h"), D(4, "午餐前"), E(5, "午餐后2h"), F(6, "晚餐前"), G(7, "晚餐后2h"), I(9, "睡前") ,H(8, "夜间"); BloodSugarEnums(Integer id, String name) { this.id = id; 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 c02c4b2..a017894 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 @@ -594,10 +594,11 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService @Override public BaseObjectResponse health(String parentId, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); List> restList = new ArrayList<>(); Patients p = mongoTemplate.findById(parentId, Patients.class); - AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1).and("hospitalId").is("216")).with(new Sort(Sort.Direction.DESC, "checkTime")), AntExChuModel.class); - List antexModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntenatalExaminationModel.class); + AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).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(parentId).and("yn").is(1).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntenatalExaminationModel.class); for (AntenatalExaminationModel antexModel : antexModels) { Map temp = new HashMap<>(); @@ -665,6 +666,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService temp.put("hemoglobin", antExChuModel.getXhdb()); // 血红素 restList.add(temp); + Map xtMap = new HashMap<>(); + Map tzMap = new HashMap<>(); + + return RespBuilder.buildSuccess(restList); }