Commit 0206f7bbef244ab3ff46793b9461bb8fae7708fc
1 parent
5d34e1c6d2
Exists in
master
and in
6 other branches
耳塞相关接口
Showing 4 changed files with 62 additions and 5 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
View file @
0206f7b
| ... | ... | @@ -145,6 +145,11 @@ |
| 145 | 145 | private String l2; |
| 146 | 146 | |
| 147 | 147 | /** |
| 148 | + * 验光 | |
| 149 | + */ | |
| 150 | + private String optometry; | |
| 151 | + | |
| 152 | + /** | |
| 148 | 153 | * 结膜 |
| 149 | 154 | */ |
| 150 | 155 | private String conjunctiva; |
| ... | ... | @@ -208,6 +213,14 @@ |
| 208 | 213 | * 选择性注视卡检查 |
| 209 | 214 | */ |
| 210 | 215 | private String fixationCard; |
| 216 | + | |
| 217 | + public String getOptometry() { | |
| 218 | + return optometry; | |
| 219 | + } | |
| 220 | + | |
| 221 | + public void setOptometry(String optometry) { | |
| 222 | + this.optometry = optometry; | |
| 223 | + } | |
| 211 | 224 | |
| 212 | 225 | public String getRefractionL1() { |
| 213 | 226 | return refractionL1; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
View file @
0206f7b
| 1 | 1 | package com.lyms.platform.operate.web.controller; |
| 2 | 2 | |
| 3 | +import com.lyms.platform.common.annotation.TokenRequired; | |
| 3 | 4 | import com.lyms.platform.common.base.BaseController; |
| 4 | 5 | import com.lyms.platform.common.result.BaseResponse; |
| 5 | 6 | import com.lyms.platform.operate.web.service.BabyEyeCheckService; |
| ... | ... | @@ -31,6 +32,13 @@ |
| 31 | 32 | @RequestMapping(method = RequestMethod.POST) |
| 32 | 33 | public BaseResponse addOrUpdate(@RequestBody BabyEyeCheck babyEyeCheck, HttpServletRequest request) { |
| 33 | 34 | return babyEyeCheckService.addOrUpdate(getUserId(request), babyEyeCheck); |
| 35 | + } | |
| 36 | + | |
| 37 | + @ResponseBody | |
| 38 | + @TokenRequired | |
| 39 | + @RequestMapping(value = "/query/{id}", method = RequestMethod.GET) | |
| 40 | + public BaseResponse query(@PathVariable String id, HttpServletRequest request) { | |
| 41 | + return babyEyeCheckService.query(getUserId(request), id); | |
| 34 | 42 | } |
| 35 | 43 | |
| 36 | 44 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java
View file @
0206f7b
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
0206f7b
| ... | ... | @@ -8,24 +8,24 @@ |
| 8 | 8 | import com.lyms.platform.common.utils.*; |
| 9 | 9 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
| 10 | 10 | import com.lyms.platform.operate.web.facade.BasicConfigFacade; |
| 11 | +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; | |
| 11 | 12 | import com.lyms.platform.operate.web.result.BasicConfigResult; |
| 12 | 13 | import com.lyms.platform.operate.web.service.BabyEyeCheckService; |
| 14 | +import com.lyms.platform.operate.web.utils.CollectionUtils; | |
| 15 | +import com.lyms.platform.operate.web.utils.MongoUtil; | |
| 13 | 16 | import com.lyms.platform.permission.dao.master.BabyEyeCheckMapper; |
| 14 | 17 | import com.lyms.platform.pojo.BabyEyeCheck; |
| 15 | -import com.lyms.platform.pojo.BabyEyePatient; | |
| 16 | 18 | import com.lyms.platform.pojo.BabyModel; |
| 17 | 19 | import com.lyms.platform.pojo.NewbornVisit; |
| 18 | 20 | import org.springframework.beans.factory.annotation.Autowired; |
| 21 | +import org.springframework.data.domain.Sort; | |
| 19 | 22 | import org.springframework.data.mongodb.core.MongoTemplate; |
| 20 | 23 | import org.springframework.data.mongodb.core.query.Criteria; |
| 21 | 24 | import org.springframework.data.mongodb.core.query.Query; |
| 22 | 25 | import org.springframework.data.mongodb.core.query.Update; |
| 23 | 26 | import org.springframework.stereotype.Service; |
| 24 | 27 | |
| 25 | -import java.util.ArrayList; | |
| 26 | -import java.util.Date; | |
| 27 | -import java.util.List; | |
| 28 | -import java.util.Map; | |
| 28 | +import java.util.*; | |
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | * Created by lt on 2017/8/5 0005 |
| ... | ... | @@ -47,6 +47,12 @@ |
| 47 | 47 | @Autowired |
| 48 | 48 | private MongoTemplate mongoTemplate; |
| 49 | 49 | |
| 50 | + @Autowired | |
| 51 | + private MongoUtil mongoUtil; | |
| 52 | + | |
| 53 | + @Autowired | |
| 54 | + private OrganizationGroupsFacade organizationGroupsFacade; | |
| 55 | + | |
| 50 | 56 | @Override |
| 51 | 57 | public BaseObjectResponse init() { |
| 52 | 58 | List<Map<String, Object>> addSubtract = EnumUtil.toJson(AddSubtractEnums.class); /** (+) (一) 其他 */ |
| ... | ... | @@ -94,6 +100,34 @@ |
| 94 | 100 | @Override |
| 95 | 101 | public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth) { |
| 96 | 102 | return null; |
| 103 | + } | |
| 104 | + | |
| 105 | + @Override | |
| 106 | + public BaseResponse query(Integer userId, String babyId) { | |
| 107 | + List<String> hospitalIds = organizationGroupsFacade.findGroupHospital(userId, false); | |
| 108 | + if(CollectionUtils.isEmpty(hospitalIds)) { | |
| 109 | + return RespBuilder.buildSuccess(); | |
| 110 | + } | |
| 111 | + List<BabyEyeCheck> babyEyeChecks = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").in(hospitalIds).and("yn").ne("0")) | |
| 112 | + .with(new Sort(Sort.Direction.DESC, "checkTime")), BabyEyeCheck.class); | |
| 113 | + List<Map<String, Object>> rest = new ArrayList<>(); | |
| 114 | + for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { | |
| 115 | + Map<String, Object> temp = new HashMap<>(); | |
| 116 | + temp.put("id", babyEyeCheck.getId()); | |
| 117 | + temp.put("hospitalId", babyEyeCheck.getHospitalId()); | |
| 118 | + temp.put("pid", babyEyeCheck.getPid()); | |
| 119 | + BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); | |
| 120 | + if(babyModel != null) { | |
| 121 | + temp.put("name", babyModel.getName()); | |
| 122 | + if(babyModel.getSex() != null) { | |
| 123 | + temp.put("sex", SexEnum.getTextById(babyModel.getSex())); | |
| 124 | + } | |
| 125 | + } | |
| 126 | + temp.put("checkTime", babyEyeCheck.getCheckTime() == null ? null : DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); | |
| 127 | + CollectionUtils.removeNullValue(temp); | |
| 128 | + rest.add(temp); | |
| 129 | + } | |
| 130 | + return RespBuilder.buildSuccess(rest); | |
| 97 | 131 | } |
| 98 | 132 | } |