From 015ba486c2ac93c4c8fa4235879728596a854498 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Fri, 15 Jul 2022 13:28:29 +0800 Subject: [PATCH] =?UTF-8?q?7=E6=9C=8814=E9=9A=86=E5=8C=96=E5=A6=87?= =?UTF-8?q?=E5=B9=BC=E5=84=BF=E4=BF=9D=E5=A2=9E=E5=8A=A0=E5=B1=88=E5=85=89?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=82=E5=90=8C=E6=97=B6=E7=9C=BC=E4=BF=9D?= =?UTF-8?q?=E5=81=A5=E6=A3=80=E6=9F=A5=E8=AF=BB=E5=8F=96=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=84=BF=E4=BF=9D=E7=9A=84=E5=B1=88=E5=85=89?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/BabyCheckModel.java | 73 ++++++++++++++++++++++ .../web/controller/LhBabyEyeCheckController.java | 12 ++++ .../operate/web/facade/BabyCheckFacade.java | 14 +++++ .../operate/web/facade/LhBabyEyeCheckFacade.java | 26 ++++++++ .../platform/operate/web/facade/ViewFacade.java | 7 +++ .../operate/web/request/BabyCheckRequest.java | 73 ++++++++++++++++++++++ .../operate/web/result/BabyCheckPageResult.java | 73 ++++++++++++++++++++++ .../operate/web/result/BabyCheckResult.java | 73 ++++++++++++++++++++++ 8 files changed, 351 insertions(+) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index c5097fb..d3e1cfe 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -661,6 +661,79 @@ public class BabyCheckModel extends BaseModel { * 25羟基D3 ng/ml */ private String lhqjd3; + //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值 + /** + * 屈光筛查，L + */ + private String lhdsl; + /** + * 屈光筛查，L + */ + private String lhdcl; + /** + * 屈光筛查，L + */ + private String lhaxisl; + /** + * 屈光筛查，R + */ + private String lhdsr; + /** + * 屈光筛查，R + */ + private String lhdcr; + /** + * 屈光筛查，R + */ + private String lhaxisr; + + public String getLhdsl() { + return lhdsl; + } + + public void setLhdsl(String lhdsl) { + this.lhdsl = lhdsl; + } + + public String getLhdcl() { + return lhdcl; + } + + public void setLhdcl(String lhdcl) { + this.lhdcl = lhdcl; + } + + public String getLhaxisl() { + return lhaxisl; + } + + public void setLhaxisl(String lhaxisl) { + this.lhaxisl = lhaxisl; + } + + public String getLhdsr() { + return lhdsr; + } + + public void setLhdsr(String lhdsr) { + this.lhdsr = lhdsr; + } + + public String getLhdcr() { + return lhdcr; + } + + public void setLhdcr(String lhdcr) { + this.lhdcr = lhdcr; + } + + public String getLhaxisr() { + return lhaxisr; + } + + public void setLhaxisr(String lhaxisr) { + this.lhaxisr = lhaxisr; + } public String getLhqjd() { return lhqjd; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java index 1035a29..09cfdd9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java @@ -106,6 +106,18 @@ public class LhBabyEyeCheckController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return lhBabyEyeCheckFacade.queryBabyEyeListPage(babyModelQuery,loginState.getId()); } + /** + * 隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值 + * @param id + * @param request + * @return + */ + @ResponseBody + @TokenRequired + @RequestMapping(value = "/getBabyCheckDioptric",method = RequestMethod.GET) + public BaseResponse getBabyCheckDioptric(String id, HttpServletRequest request) { + return lhBabyEyeCheckFacade.getBabyCheckDioptric(id); + } 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 0fc153c..d872b46 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 @@ -776,6 +776,13 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setLhqjd(request.getLhqjd()); model.setLhqjd2(request.getLhqjd2()); model.setLhqjd3(request.getLhqjd3()); + //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值 + model.setLhdsr(request.getLhdsr()); + model.setLhdcr(request.getLhdcr()); + model.setLhaxisr(request.getLhaxisr()); + model.setLhdsl(request.getLhdsl()); + model.setLhdcl(request.getLhdcl()); + model.setLhaxisl(request.getLhaxisl()); return model; } @@ -2792,6 +2799,13 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setLhqjd(checkModel.getLhqjd()); model.setLhqjd2(checkModel.getLhqjd2()); model.setLhqjd3(checkModel.getLhqjd3()); + //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值 + model.setLhdsr(checkModel.getLhdsr()); + model.setLhdcr(checkModel.getLhdcr()); + model.setLhaxisr(checkModel.getLhaxisr()); + model.setLhdsl(checkModel.getLhdsl()); + model.setLhdcl(checkModel.getLhdcl()); + model.setLhaxisl(checkModel.getLhaxisl()); return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java index 8613c81..9cb30e5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.BabyBookbuildingService; +import com.lyms.platform.biz.service.BabyCheckService; import com.lyms.platform.biz.service.LhBabyEyeCheckService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; @@ -13,8 +14,10 @@ import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.pojo.BabyCheckModel; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.LhBabyEyeCheck; +import com.lyms.platform.query.BabyCheckModelQuery; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.LhBabyEyelCheckQuery; import com.sun.tools.javac.util.Convert; @@ -45,6 +48,8 @@ public class LhBabyEyeCheckFacade { private CouponMapper couponMapper; @Autowired private OperateLogFacade operateLogFacade; + @Autowired + private BabyCheckService babyCheckService; public BaseResponse addOrUpDate(LhBabyEyeCheck babyCheck, Integer userid) { //隆化眼外观新加内容 @@ -591,4 +596,25 @@ public class LhBabyEyeCheckFacade { return map; } + public BaseResponse getBabyCheckDioptric(String id) { + BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); + babyCheckModelQuery.setYn(YnEnums.YES.getId()); + babyCheckModelQuery.setBuildId(id); + Map map=new HashMap(); + List babyCheckModels = babyCheckService.queryBabyCheckRecord(babyCheckModelQuery, "created", Sort.Direction.DESC); + if (babyCheckModels.size()>0) { + BabyCheckModel checkModel=babyCheckModels.get(0); + map.put("lhdsl",checkModel.getLhdsl()); + map.put("lhdcl",checkModel.getLhdcl()); + map.put("lhaxisl",checkModel.getLhaxisl()); + map.put("lhdsr",checkModel.getLhdsr()); + map.put("lhdcr",checkModel.getLhdcr()); + map.put("lhaxisr",checkModel.getLhaxisr()); + } + BaseResponse baseResponse=new BaseResponse(); + baseResponse.setErrormsg("成功"); + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + baseResponse.setObject(map); + return baseResponse; + } } 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 7e836a4..6fb7cad 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 @@ -6461,6 +6461,13 @@ public class ViewFacade { model.setLhqjd(checkModel.getLhqjd()); model.setLhqjd2(checkModel.getLhqjd2()); model.setLhqjd3(checkModel.getLhqjd3()); + //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值 + model.setLhdsr(checkModel.getLhdsr()); + model.setLhdcr(checkModel.getLhdcr()); + model.setLhaxisr(checkModel.getLhaxisr()); + model.setLhdsl(checkModel.getLhdsl()); + model.setLhdcl(checkModel.getLhdcl()); + model.setLhaxisl(checkModel.getLhaxisl()); return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 2b0ac2d..fc1a8fe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -620,6 +620,79 @@ public class BabyCheckRequest { * 25羟基D3 ng/ml */ private String lhqjd3; + //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值 + /** + * 屈光筛查，L + */ + private String lhdsl; + /** + * 屈光筛查，L + */ + private String lhdcl; + /** + * 屈光筛查，L + */ + private String lhaxisl; + /** + * 屈光筛查，R + */ + private String lhdsr; + /** + * 屈光筛查，R + */ + private String lhdcr; + /** + * 屈光筛查，R + */ + private String lhaxisr; + + public String getLhdsl() { + return lhdsl; + } + + public void setLhdsl(String lhdsl) { + this.lhdsl = lhdsl; + } + + public String getLhdcl() { + return lhdcl; + } + + public void setLhdcl(String lhdcl) { + this.lhdcl = lhdcl; + } + + public String getLhaxisl() { + return lhaxisl; + } + + public void setLhaxisl(String lhaxisl) { + this.lhaxisl = lhaxisl; + } + + public String getLhdsr() { + return lhdsr; + } + + public void setLhdsr(String lhdsr) { + this.lhdsr = lhdsr; + } + + public String getLhdcr() { + return lhdcr; + } + + public void setLhdcr(String lhdcr) { + this.lhdcr = lhdcr; + } + + public String getLhaxisr() { + return lhaxisr; + } + + public void setLhaxisr(String lhaxisr) { + this.lhaxisr = lhaxisr; + } public String getLhqjd() { return lhqjd; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index fbd577e..faf17a8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -838,6 +838,79 @@ public class BabyCheckPageResult { * 25羟基D3 ng/ml */ private String lhqjd3; + //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值 + /** + * 屈光筛查，L + */ + private String lhdsl; + /** + * 屈光筛查，L + */ + private String lhdcl; + /** + * 屈光筛查，L + */ + private String lhaxisl; + /** + * 屈光筛查，R + */ + private String lhdsr; + /** + * 屈光筛查，R + */ + private String lhdcr; + /** + * 屈光筛查，R + */ + private String lhaxisr; + + public String getLhdsl() { + return lhdsl; + } + + public void setLhdsl(String lhdsl) { + this.lhdsl = lhdsl; + } + + public String getLhdcl() { + return lhdcl; + } + + public void setLhdcl(String lhdcl) { + this.lhdcl = lhdcl; + } + + public String getLhaxisl() { + return lhaxisl; + } + + public void setLhaxisl(String lhaxisl) { + this.lhaxisl = lhaxisl; + } + + public String getLhdsr() { + return lhdsr; + } + + public void setLhdsr(String lhdsr) { + this.lhdsr = lhdsr; + } + + public String getLhdcr() { + return lhdcr; + } + + public void setLhdcr(String lhdcr) { + this.lhdcr = lhdcr; + } + + public String getLhaxisr() { + return lhaxisr; + } + + public void setLhaxisr(String lhaxisr) { + this.lhaxisr = lhaxisr; + } public String getLhqjd() { return lhqjd; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index f3550ca..94ea216 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -862,6 +862,79 @@ public class BabyCheckResult { * 25羟基D3 ng/ml */ private String lhqjd3; + //隆化儿保检查录入屈光值，眼保健检查时会获取儿保检查最新一次的屈光值 + /** + * 屈光筛查，L + */ + private String lhdsl; + /** + * 屈光筛查，L + */ + private String lhdcl; + /** + * 屈光筛查，L + */ + private String lhaxisl; + /** + * 屈光筛查，R + */ + private String lhdsr; + /** + * 屈光筛查，R + */ + private String lhdcr; + /** + * 屈光筛查，R + */ + private String lhaxisr; + + public String getLhdsl() { + return lhdsl; + } + + public void setLhdsl(String lhdsl) { + this.lhdsl = lhdsl; + } + + public String getLhdcl() { + return lhdcl; + } + + public void setLhdcl(String lhdcl) { + this.lhdcl = lhdcl; + } + + public String getLhaxisl() { + return lhaxisl; + } + + public void setLhaxisl(String lhaxisl) { + this.lhaxisl = lhaxisl; + } + + public String getLhdsr() { + return lhdsr; + } + + public void setLhdsr(String lhdsr) { + this.lhdsr = lhdsr; + } + + public String getLhdcr() { + return lhdcr; + } + + public void setLhdcr(String lhdcr) { + this.lhdcr = lhdcr; + } + + public String getLhaxisr() { + return lhaxisr; + } + + public void setLhaxisr(String lhaxisr) { + this.lhaxisr = lhaxisr; + } public String getLhqjd() { return lhqjd; -- 1.8.3.1