jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c455302e64123d4e6a64a344d927b3b30842427d

Authored by litao@lymsh.com
1 parent 3c331df6e5
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

逗号改括号

Showing 2 changed files with 8 additions and 3 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums.java View file @ c455302
... ... @@ -5,7 +5,7 @@
5 5 */
6 6 public enum BloodSugarEnums {
7 7  
8   - A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后2h"), D(4, "午餐前"), E(5, "午餐后2h"), F(6, "晚餐前"), G(7, "晚餐后2h"), H(8, "夜间"), I(9, "睡前");
  8 + A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后2h"), D(4, "午餐前"), E(5, "午餐后2h"), F(6, "晚餐前"), G(7, "晚餐后2h"), I(9, "睡前") ,H(8, "夜间");
9 9  
10 10 BloodSugarEnums(Integer id, String name) {
11 11 this.id = id;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ c455302
... ... @@ -594,10 +594,11 @@
594 594  
595 595 @Override
596 596 public BaseObjectResponse health(String parentId, Integer userId) {
  597 + String hospitalId = autoMatchFacade.getHospitalId(userId);
597 598 List<Map<String, Object>> restList = new ArrayList<>();
598 599 Patients p = mongoTemplate.findById(parentId, Patients.class);
599   - 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);
600   - List<AntenatalExaminationModel> antexModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "checkTime")), AntenatalExaminationModel.class);
  600 + 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);
  601 + List<AntenatalExaminationModel> 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);
601 602  
602 603 for (AntenatalExaminationModel antexModel : antexModels) {
603 604 Map<String, Object> temp = new HashMap<>();
... ... @@ -664,6 +665,10 @@
664 665 temp.put("urineProtein", antExChuModel.getNdb()); // 尿蛋白
665 666 temp.put("hemoglobin", antExChuModel.getXhdb()); // 血红素
666 667 restList.add(temp);
  668 +
  669 + Map<String, Object> xtMap = new HashMap<>();
  670 + Map<String, Object> tzMap = new HashMap<>();
  671 +
667 672  
668 673  
669 674 return RespBuilder.buildSuccess(restList);