From b237dc6072e149aa8e9ea860bcc7f16a60738392 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 9 Oct 2019 11:34:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=B5=8B=E9=87=8F=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/BabyNutritionController.java | 17 ++++++++- .../operate/web/facade/BabyNutritionFacade.java | 44 ++++++++++++++++++++++ .../src/main/resources/config.properties | 2 +- 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java index 29ab836..7e51ce2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionController.java @@ -9,6 +9,9 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.facade.BabyNutritionFacade; import com.lyms.platform.operate.web.request.BabyNutritionRequest; import com.lyms.platform.operate.web.request.BabyNutritionSettleRequest; +import com.lyms.platform.pojo.MeasureBabyInfoModel; +import com.lyms.platform.query.MeasureBabyDataInfoQuery; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -18,6 +21,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Calendar; import java.util.Date; +import java.util.List; /** @@ -215,7 +219,18 @@ public class BabyNutritionController extends BaseController { public void settleHistoryExport(@Valid @RequestBody BabyNutritionSettleRequest request, HttpServletResponse response) { getStartTimeAndEndTime(request); - babyNutritionFacade.settleHistoryExport(request,response); + babyNutritionFacade.settleHistoryExport(request, response); + } + + + /** + * 当天测量体重记录的儿童 + * @param request + */ + @RequestMapping(method = RequestMethod.GET, value = "/getTodayBabyMeasures") + @TokenRequired + public BaseResponse getTodayBabyMeasures(HttpServletRequest request) { + return babyNutritionFacade.getTodayBabyMeasures(getUserId(request)); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index be61e86..d178a1e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -1629,4 +1629,48 @@ public class BabyNutritionFacade { } } + public BaseResponse getTodayBabyMeasures(Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + + MeasureBabyDataInfoQuery query = new MeasureBabyDataInfoQuery(); + query.setHospitalId(hospitalId); + String today = DateUtil.getyyyy_MM_dd(new Date()); + query.setModifiedTimeStart(DateUtil.parseYMDHMS(today + " 00:00:00")); + query.setModifiedTimeEnd(DateUtil.parseYyyyMMddHHssmm(today + " 23:59:59")); + query.setSort(" modified desc "); + List datas = new ArrayList<>(); + List models = mysqlMeasureDataInfoService.queryMeasureBabyInfoList(query); + if (CollectionUtils.isNotEmpty(models)) { + for (MeasureBabyInfoModel model : models) + { + if (!StringUtils.isNotEmpty(model.getBabyId())) + { + continue; + } + + BabyModel baby = babyBookbuildingService.queryBabyBuildById(model.getBabyId()); + + if (baby != null) + { + Map map = new HashMap(); + map.put("weight", model.getValueOne()); + map.put("hegiht", model.getValueTwo()); + map.put("lastTime", DateUtil.getyyyy_MM_dd(model.getModified())); + map.put("babyId", model.getBabyId()); + map.put("babyName", baby.getName()); + map.put("babySex", SexEnum.getTextById(baby.getSex())); + map.put("monthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), new Date()))); + map.put("motherName", baby.getMname()); + map.put("phone", baby.getMphone()); + map.put("vcCardNo", baby.getVcCardNo()); + datas.add(map); + } + } + } + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(datas); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index fe669d0..0ac94bf 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -35,7 +35,7 @@ ams_url=http://ams.api.stage.healthbaby.com.cn #同步数据到v2.0 sync_to_v2_url=http://hengshui.mamibeibi.com:8091 -#华大基因url 测试 正式bisp-tssfy tssfy123456 +#华大基因url 测试 2019年11月8号）将不支持http 正式bisp-tssfy tssfy123456 正式：https://applet.bgi.com/bisp-all/ 测试：https://hbms.bgi.com/bisp-all/ huada_url=http://119.23.237.220/bisp-all huada_syscode=bisp-czsfy huada_secret=czsfy123$ -- 1.8.3.1