jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a23f25141de47119ffe71ba27d219f5342ab1a07

Authored by shiyang
1 parent 8d2d38c97e
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 7 additions and 14 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LhBabyEyeCheckService.java View file @ a23f251
... ... @@ -5,9 +5,7 @@
5 5 import com.lyms.platform.common.dao.operator.MongoOper;
6 6 import com.lyms.platform.common.dao.operator.MongoQuery;
7 7 import com.lyms.platform.common.enums.YnEnums;
8   -import com.lyms.platform.pojo.BabyOralCheck;
9 8 import com.lyms.platform.pojo.LhBabyEyeCheck;
10   -import com.lyms.platform.query.BabyOralCheckQuery;
11 9 import com.lyms.platform.query.LhBabyEyelCheckQuery;
12 10 import org.apache.commons.lang.StringUtils;
13 11 import org.springframework.data.domain.Sort;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyEyeCheckController.java View file @ a23f251
... ... @@ -4,12 +4,9 @@
4 4 import com.lyms.platform.common.base.BaseController;
5 5 import com.lyms.platform.common.base.LoginContext;
6 6 import com.lyms.platform.common.result.BaseResponse;
7   -import com.lyms.platform.operate.web.facade.BabyOralCheckFacade;
8 7 import com.lyms.platform.operate.web.facade.LhBabyEyeCheckFacade;
9   -import com.lyms.platform.pojo.BabyOralCheck;
10 8 import com.lyms.platform.pojo.LhBabyEyeCheck;
11 9 import com.lyms.platform.query.BabyModelQuery;
12   -import com.lyms.platform.query.BabyOralCheckQuery;
13 10 import com.lyms.platform.query.LhBabyEyelCheckQuery;
14 11 import org.springframework.beans.factory.annotation.Autowired;
15 12 import org.springframework.stereotype.Controller;
16 13  
... ... @@ -105,9 +102,9 @@
105 102 @ResponseBody
106 103 @TokenRequired
107 104 @RequestMapping(value = "/queryAllBabyListPage",method = RequestMethod.GET)
108   - public BaseResponse queryBabyOralListPage(BabyModelQuery babyModelQuery, HttpServletRequest request) {
  105 + public BaseResponse queryBabyEyeListPage(BabyModelQuery babyModelQuery, HttpServletRequest request) {
109 106 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
110   - return lhBabyEyeCheckFacade.queryBabyOralListPage(babyModelQuery,loginState.getId());
  107 + return lhBabyEyeCheckFacade.queryBabyEyeListPage(babyModelQuery,loginState.getId());
111 108 }
112 109  
113 110  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java View file @ a23f251
1 1 package com.lyms.platform.operate.web.facade;
2 2  
3 3 import com.lyms.platform.biz.service.BabyBookbuildingService;
4   -import com.lyms.platform.biz.service.BabyOralCheckService;
5 4 import com.lyms.platform.biz.service.LhBabyEyeCheckService;
6 5 import com.lyms.platform.common.constants.ErrorCodeConstants;
7 6 import com.lyms.platform.common.enums.*;
8 7  
9 8  
... ... @@ -17,11 +16,10 @@
17 16 import com.lyms.platform.permission.dao.master.CouponMapper;
18 17 import com.lyms.platform.permission.model.Organization;
19 18 import com.lyms.platform.permission.service.OrganizationService;
  19 +import com.lyms.platform.pojo.BabyEyeCheck;
20 20 import com.lyms.platform.pojo.BabyModel;
21   -import com.lyms.platform.pojo.BabyOralCheck;
22 21 import com.lyms.platform.pojo.LhBabyEyeCheck;
23 22 import com.lyms.platform.query.BabyModelQuery;
24   -import com.lyms.platform.query.BabyOralCheckQuery;
25 23 import com.lyms.platform.query.LhBabyEyelCheckQuery;
26 24 import org.springframework.beans.factory.annotation.Autowired;
27 25 import org.springframework.data.domain.Sort;
... ... @@ -96,7 +94,7 @@
96 94 babyCheck.setOperaterId(userid+"");
97 95 babyCheck.setModified(new Date());
98 96 lhBabyEyeCheckService.update(babyCheck);
99   - BabyOralCheck Check = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyCheck.getId())), BabyOralCheck.class);
  97 + BabyEyeCheck Check = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyCheck.getId())), BabyEyeCheck.class);
100 98 if (null!=Check) {
101 99 operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), Check, OptActionEnums.UPDATE.getId(), "修改眼健康检查");
102 100 }
103 101  
... ... @@ -262,9 +260,9 @@
262 260 request.setChuPositiveType("2");
263 261 request.setPositiveType("1");
264 262 }
265   - List<LhBabyEyeCheck> babyOralChecks=lhBabyEyeCheckService.queryList(request,Sort.Direction.DESC,"eyeCheckTime");
  263 + List<LhBabyEyeCheck> babyEyeChecks=lhBabyEyeCheckService.queryList(request,Sort.Direction.DESC,"eyeCheckTime");
266 264 List<Map> result=new ArrayList<>();
267   - for (LhBabyEyeCheck babyCheck : babyOralChecks) {
  265 + for (LhBabyEyeCheck babyCheck : babyEyeChecks) {
268 266 Map<String,Object> map=ReflectionUtils.beanToMap(babyCheck);//对象转map
269 267 map.put("sex",SexEnum.getTextById(babyCheck.getBabySex()));
270 268 map.put("eyeCheckDoctor",couponMapper.getUserName(babyCheck.getEyeCheckDoctor()));
... ... @@ -278,7 +276,7 @@
278 276 return br;
279 277 }
280 278  
281   - public BaseResponse queryBabyOralListPage(BabyModelQuery babyModelQuery, Integer userId) {
  279 + public BaseResponse queryBabyEyeListPage(BabyModelQuery babyModelQuery, Integer userId) {
282 280 String hospitalId = autoMatchFacade.getHospitalId(userId);
283 281 babyModelQuery.setNeed("true");
284 282 babyModelQuery.setYn(YnEnums.YES.getId());