From 68c849a7fab2c6c4479e7c365ee16160382a67c0 Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 16 Apr 2018 16:23:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=A1=80=E7=B3=96=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 1 + .../operate/web/service/impl/BloodSugarServiceImpl.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index b5d3820..352770a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -275,6 +275,7 @@ public class AntenatalExaminationFacade { AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { + //建立隐藏档案 String parentId = handHideBuild(antExAddRequest.getPid(), antExAddRequest.getParentId(), userId, 1); model.setParentId(parentId); antExAddRequest.setParentId(parentId); 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 3097602..8901a3c 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 @@ -22,6 +22,7 @@ import com.lyms.platform.operate.web.utils.MathUtil; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.pojo.BloodSugar; import com.lyms.platform.pojo.Patients; +import org.apache.commons.collections.map.HashedMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; @@ -371,8 +372,15 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga } monthCountSet3.add(month); } + Map newBloodMap = new HashedMap(); - return RespBuilder.buildSuccess("restList", restList, "count", bloodSugars.size(), "dayCount", dayCountSet.size(), "month", monthCountSet3, "monthAvgMap", monthAvgMap, "weekAvgMap", weekAvgMap); + if(CollectionUtils.isNotEmpty(bloodSugars)){ + BloodSugar bloodSugar = bloodSugars.get(0); + newBloodMap.put("bloodSugar",bloodSugar.getBloodSugar()); + newBloodMap.put("bloodSugarType",bloodSugar.getBloodSugarType()); + } + + return RespBuilder.buildSuccess("restList", restList, "count", bloodSugars.size(), "dayCount", dayCountSet.size(), "month", monthCountSet3, "monthAvgMap", monthAvgMap, "weekAvgMap", weekAvgMap,"newBloodVal",newBloodMap); } } -- 1.8.3.1