From 0206f7bbef244ab3ff46793b9461bb8fae7708fc Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 9 Aug 2017 11:03:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=B3=E5=A1=9E=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BabyEyeCheck.java | 13 +++++++ .../web/controller/BabyEyeCheckController.java | 8 ++++ .../operate/web/service/BabyEyeCheckService.java | 2 + .../web/service/impl/BabyEyeCheckServiceImpl.java | 44 +++++++++++++++++++--- 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java index ef2db6e..929ba1e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java @@ -145,6 +145,11 @@ public class BabyEyeCheck { private String l2; /** + * 验光 + */ + private String optometry; + + /** * 结膜 */ private String conjunctiva; @@ -209,6 +214,14 @@ public class BabyEyeCheck { */ private String fixationCard; + public String getOptometry() { + return optometry; + } + + public void setOptometry(String optometry) { + this.optometry = optometry; + } + public String getRefractionL1() { return refractionL1; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java index ce270f7..d16c628 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java @@ -1,5 +1,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.result.BaseResponse; import com.lyms.platform.operate.web.service.BabyEyeCheckService; @@ -33,6 +34,13 @@ public class BabyEyeCheckController extends BaseController { return babyEyeCheckService.addOrUpdate(getUserId(request), babyEyeCheck); } + @ResponseBody + @TokenRequired + @RequestMapping(value = "/query/{id}", method = RequestMethod.GET) + public BaseResponse query(@PathVariable String id, HttpServletRequest request) { + return babyEyeCheckService.query(getUserId(request), id); + } + /** * 保存之后查看的数据 * @param id diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java index a1b333c..f138d0a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java @@ -22,4 +22,6 @@ public interface BabyEyeCheckService { BaseResponse delete(String id); BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth); + + BaseResponse query(Integer userId, String babyId); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 997b2a0..ee4092f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -8,24 +8,24 @@ import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.BasicConfigFacade; +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.service.BabyEyeCheckService; +import com.lyms.platform.operate.web.utils.CollectionUtils; +import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.dao.master.BabyEyeCheckMapper; import com.lyms.platform.pojo.BabyEyeCheck; -import com.lyms.platform.pojo.BabyEyePatient; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.NewbornVisit; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; 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.data.mongodb.core.query.Update; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by lt on 2017/8/5 0005 @@ -47,6 +47,12 @@ public class BabyEyeCheckServiceImpl implements BabyEyeCheckService { @Autowired private MongoTemplate mongoTemplate; + @Autowired + private MongoUtil mongoUtil; + + @Autowired + private OrganizationGroupsFacade organizationGroupsFacade; + @Override public BaseObjectResponse init() { List> addSubtract = EnumUtil.toJson(AddSubtractEnums.class); /** (+) (一) 其他 */ @@ -95,4 +101,32 @@ public class BabyEyeCheckServiceImpl implements BabyEyeCheckService { public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth) { return null; } + + @Override + public BaseResponse query(Integer userId, String babyId) { + List hospitalIds = organizationGroupsFacade.findGroupHospital(userId, false); + if(CollectionUtils.isEmpty(hospitalIds)) { + return RespBuilder.buildSuccess(); + } + List babyEyeChecks = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").in(hospitalIds).and("yn").ne("0")) + .with(new Sort(Sort.Direction.DESC, "checkTime")), BabyEyeCheck.class); + List> rest = new ArrayList<>(); + for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { + Map temp = new HashMap<>(); + temp.put("id", babyEyeCheck.getId()); + temp.put("hospitalId", babyEyeCheck.getHospitalId()); + temp.put("pid", babyEyeCheck.getPid()); + BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); + if(babyModel != null) { + temp.put("name", babyModel.getName()); + if(babyModel.getSex() != null) { + temp.put("sex", SexEnum.getTextById(babyModel.getSex())); + } + } + temp.put("checkTime", babyEyeCheck.getCheckTime() == null ? null : DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); + CollectionUtils.removeNullValue(temp); + rest.add(temp); + } + return RespBuilder.buildSuccess(rest); + } } -- 1.8.3.1