From 2442bfdc02f9a2eabde656c6b54cfc8b562e1f0d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 20 Mar 2018 10:35:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=AB=E9=AB=98=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 | 15 ++++++ .../web/facade/AntenatalExaminationFacade.java | 63 ++++++++++++++++++++++ .../platform/operate/web/facade/ViewFacade.java | 2 +- 3 files changed, 79 insertions(+), 1 deletion(-) 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 c0362ad..af7ebc7 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 @@ -355,4 +355,19 @@ public class AntenatalExaminationController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return antenatalExaminationFacade.getLastRisk(patientId, loginState.getId()); } + + + /** + * 宫高曲线图 + * @param patientId + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getGongGaoLine") + @ResponseBody + @TokenRequired + public BaseResponse getGongGaoLine(@RequestParam(required = true) String patientId,HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antenatalExaminationFacade.getGongGaoLine(patientId, loginState.getId()); + } } \ No newline at end of file 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 1476bbd..b3b6964 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 @@ -1487,6 +1487,7 @@ public class AntenatalExaminationFacade { } + public class SortIn { public SortIn(Patients patients) { @@ -2537,4 +2538,66 @@ public class AntenatalExaminationFacade { } return doctors; } + + public BaseResponse getGongGaoLine(String patientId, Integer id) { + + Map map = new HashMap<>(); + + List titles = new ArrayList<>(); + List values = new ArrayList<>(); + + + List> tables = new LinkedList<>(); + + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setParentId(patientId); + List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChuModels)) + { + AntExChuModel chumodel = antExChuModels.get(0); + if (chumodel != null && StringUtils.isNotEmpty(chumodel.getGonggao())) + { + Map item = new HashMap<>(); + item.put(DateUtil.getyyyy_MM_dd(chumodel.getCheckTime()), chumodel.getGonggao()); + if (StringUtils.isNumeric(chumodel.getGonggao())) + { + titles.add(DateUtil.getyyyy_MM_dd(chumodel.getCheckTime())); + values.add(chumodel.getGonggao()); + } + tables.add(item); + } + } + + + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setParentId(patientId); + antExQuery.setYn(YnEnums.YES.getId()); + List examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.ASC, "created")); + if (CollectionUtils.isNotEmpty(examinationModelList)) + { + for (AntenatalExaminationModel anmodel : examinationModelList) + { + if (anmodel != null && StringUtils.isNotEmpty(anmodel.getGongGao())) + { + Map item = new HashMap<>(); + item.put(DateUtil.getyyyy_MM_dd(anmodel.getCheckDate()), anmodel.getGongGao()); + if (StringUtils.isNumeric(anmodel.getGongGao())) + { + titles.add(DateUtil.getyyyy_MM_dd(anmodel.getCheckDate())); + values.add(anmodel.getGongGao()); + } + tables.add(item); + } + } + } + + map.put("titles",titles); + map.put("values",values); + map.put("tables",tables); + + return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 7ed6010..f80af77 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1945,7 +1945,7 @@ public class ViewFacade { szy = chBpMap.get("szy"); } map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG)); - map.put("gongGao", UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM)); + map.put("gongGao", StringUtils.isNumeric(data.getGongGao()) ? UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM) : data.getGongGao() == null ? "" : data.getGongGao()); if (StringUtils.isNotEmpty(data.getGongGaoSelect())) { map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGongGaoSelect())); -- 1.8.3.1