From 124379ff0834c63ee9eb689fb51eb2292e43f2d4 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 20 Mar 2018 11:16:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=9B=B2=E7=BA=BF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AntenatalExaminationController.java | 2 +- .../web/controller/BabyCheckController.java | 23 +++++-- .../operate/web/facade/BabyCheckFacade.java | 74 ++++++++++++++++++++++ .../operate/web/facade/SmsTemplateFacade.java | 2 +- 4 files changed, 95 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index af7ebc7..8ea78b0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -363,7 +363,7 @@ public class AntenatalExaminationController extends BaseController { * @param request * @return */ - @RequestMapping(method = RequestMethod.GET, value = "/getGongGaoLine") + @RequestMapping(method = RequestMethod.GET, value = "/getGongGaoCurve") @ResponseBody @TokenRequired public BaseResponse getGongGaoLine(@RequestParam(required = true) String patientId,HttpServletRequest request) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index 50e0041..3c1ea47 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -69,7 +69,7 @@ public class BabyCheckController extends BaseController{ @ResponseBody @TokenRequired public BaseResponse deleteBabyBuildById(@PathVariable("id")String id,HttpServletRequest request){ - babyCheckFacade.deleteBabyCheckById(id,getUserId(request)); + babyCheckFacade.deleteBabyCheckById(id, getUserId(request)); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -152,7 +152,7 @@ public class BabyCheckController extends BaseController{ @RequestParam(required = true) Double weight, @RequestParam(required = true) Integer sex, @RequestParam(required = true) String birth){ - return babyCheckFacade.queryHWByHeight(height,weight, sex,birth); + return babyCheckFacade.queryHWByHeight(height, weight, sex, birth); } @@ -170,7 +170,7 @@ public class BabyCheckController extends BaseController{ @RequestParam(required = true) Integer sex, @RequestParam(required = true) Integer type, @RequestParam(required = true) String birth){ - return babyCheckFacade.queryBabyHealthStatus(birth,value, sex, type); + return babyCheckFacade.queryBabyHealthStatus(birth, value, sex, type); } @@ -208,10 +208,25 @@ public class BabyCheckController extends BaseController{ public BaseObjectResponse getBabyMonthAge( @RequestParam(required = true) String birth, @RequestParam(required = false) String checkDate){ - return babyCheckFacade.getBabyMonthAge(birth,checkDate); + return babyCheckFacade.getBabyMonthAge(birth, checkDate); } + /** + *儿童检查曲线图 + * @param babyId + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getBabyCurve") + @ResponseBody + @TokenRequired + public BaseResponse getBabyCurve(@RequestParam(required = true) String babyId,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return babyCheckFacade.getBabyCurve(babyId, loginState.getId()); + } + + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index f031910..eefe522 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -7,6 +7,7 @@ import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.BabyCheckRequest; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.MongoUtil; @@ -19,6 +20,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; @@ -1630,4 +1632,76 @@ public class BabyCheckFacade { return res; } + + public BaseResponse getBabyCurve(String babyId, Integer id) { + + Map map = new HashMap<>(); + + List weightTitles = new LinkedList<>(); + List weightValues = new LinkedList<>(); + + List heightTitles = new LinkedList<>(); + List heightValues = new LinkedList<>(); + + List> tables = new LinkedList<>(); + + BabyCheckModelQuery query = new BabyCheckModelQuery(); + query.setYn(YnEnums.YES.getId()); + query.setBuildId(babyId); + //查询儿童的检查记录 + List checkModels = babyCheckService.queryBabyCheckRecord(query, "checkDate", Sort.Direction.ASC); + if (CollectionUtils.isNotEmpty(checkModels)) + { + for (BabyCheckModel checkModel : checkModels) + { + if (checkModel != null) + { + if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight()) || org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getWeight())) + { + Map heightMap = new HashMap<>(); + if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getHeight())) + { + if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getHeight())) + { + heightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); + heightValues.add(checkModel.getHeight()); + } + heightMap.put("time",DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); + heightMap.put("height", checkModel.getHeight()); + } + else + { + heightMap.put("height", "--"); + } + + if (org.apache.commons.lang.StringUtils.isNotEmpty(checkModel.getWeight())) + { + if (org.apache.commons.lang.StringUtils.isNumeric(checkModel.getWeight())) + { + weightTitles.add(DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); + weightValues.add(checkModel.getWeight()); + } + heightMap.put("time", DateUtil.getyyyy_MM_dd(checkModel.getCheckDate())); + heightMap.put("weight",checkModel.getWeight()); + } + else + { + heightMap.put("weight", "--"); + } + + tables.add(heightMap); + } + } + } + } + map.put("weightTitles",weightTitles); + map.put("weightValues",weightValues); + + map.put("heightTitles",heightTitles); + map.put("heightValues",heightValues); + + map.put("tables",tables); + + return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java index a975acb..21ee587 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java @@ -253,7 +253,7 @@ public class SmsTemplateFacade { result.put("serviceStatusName", ServiceStatusEnums.getNameById(temp.getServiceStatus())); result.put("content", temp.getContent()); - String str = "一次 预约短信"; + String str = "一次 预约"+((temp.getTemplateType() == null || temp.getTemplateType() == 0 ) ? "推送" : "短信"); if (temp.getSmsType() != null && temp.getSmsType() != SmsServiceEnums.CJYYTX.getId() && temp.getSmsType() != SmsServiceEnums.CHFCYUTX.getId() && temp.getSmsType() != SmsServiceEnums.EBYYTX.getId() && temp.getSmsType() != SmsServiceEnums.YBYYTX.getId() -- 1.8.3.1