From 6006c8f4a5863e4b6daa65a776f04a847151145c Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Wed, 20 Mar 2019 16:50:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/service/CheckItemManageService.java | 3 +++ .../service/impl/CheckItemManageServiceImpl.java | 30 ++++++++++++++++++++++ .../web/controller/CheckItemManageController.java | 20 +++++---------- 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java index 2eb6e52..0727abb 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemManageService.java @@ -1,5 +1,6 @@ package com.lyms.platform.permission.service; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.permission.model.CheckItemManage; import com.lyms.platform.permission.model.CheckItemManageQuery; @@ -17,4 +18,6 @@ public interface CheckItemManageService { public Integer updateCheckItemMagage(CheckItemManage checkItemManage); public List queryCheckItemManage(CheckItemManageQuery checkItemManageQuery); + + public BaseResponse xcxGetCheckItemManage(String parentId); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java index c288928..4bb6a32 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemManageServiceImpl.java @@ -1,10 +1,16 @@ package com.lyms.platform.permission.service.impl; +import com.lyms.platform.biz.AntExChuModelTemp; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.permission.dao.master.MasterCheckItemManageMapper; import com.lyms.platform.permission.model.CheckItemManage; import com.lyms.platform.permission.model.CheckItemManageQuery; import com.lyms.platform.permission.service.CheckItemManageService; +import com.lyms.platform.pojo.AntenatalExaminationModel; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; import java.util.List; @@ -15,6 +21,9 @@ public class CheckItemManageServiceImpl implements CheckItemManageService { @Autowired private MasterCheckItemManageMapper checkItemManageMapper; + @Autowired + private MongoTemplate mongoTemplate; + @Override public List getCheckItemManageList() { return checkItemManageMapper.getCheckItemManageList(); @@ -45,4 +54,25 @@ public class CheckItemManageServiceImpl implements CheckItemManageService { public List queryCheckItemManage(CheckItemManageQuery checkItemManageQuery) { return checkItemManageMapper.queryCheckItemManage(checkItemManageQuery); } + + @Override + public BaseResponse xcxGetCheckItemManage(String parentId) { + //获取初诊 + List antExChuModelTemps = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId)), AntExChuModelTemp.class); + //获取复诊 + List antenatalExaminationModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId)), AntenatalExaminationModel.class); + //1.先查询复诊是否为空 + if (antenatalExaminationModels != null && antenatalExaminationModels.size() > 0) { + for (AntenatalExaminationModel examinationModel : antenatalExaminationModels) { + //通过修改时间获取他的最后一次记录 + System.out.println("==========>" + examinationModel.getModified()); + String string = examinationModel.getConfigItemId(); + System.out.println("===========>" + string); + } + + } + + + return null; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java index e6a8aa0..81f5636 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemManageController.java @@ -3,7 +3,6 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.StringUtils; @@ -15,16 +14,11 @@ import com.lyms.platform.permission.service.CheckItemService; import com.lyms.platform.permission.service.OrganizationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; @Controller @RequestMapping("/checkItemManage") @@ -53,6 +47,7 @@ public class CheckItemManageController extends BaseController { checkItemManageQuery.setLimit(limit); checkItemManageQuery.setAffiliateId(affiliateId); List checkItemManagesList = checkItemManageService.queryCheckItemManage(checkItemManageQuery); + checkItemManageQuery.setCount(checkItemManagesList.size()); if (StringUtils.isNotEmpty(affiliateId)) { for (CheckItemManage checkItemManage : checkItemManagesList) { ArrayList lists = new ArrayList<>(); @@ -184,14 +179,11 @@ public class CheckItemManageController extends BaseController { /** * x小程序获取医院展示项接口 */ - - @RequestMapping(value = "/xcxGetCheckItem") + @RequestMapping(value = "/xcxGetCheckItem/{id}", method = RequestMethod.GET) @ResponseBody - public BaseResponse getCheckItem(String parentId) { - //1.通过parentId去查询是否有这条数据 - - List list = new ArrayList(); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(list); + public BaseResponse getCheckItem(@PathVariable String parentId) { + return checkItemManageService.xcxGetCheckItemManage(parentId); } + } -- 1.8.3.1