diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LhBabyEyeCheckService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LhBabyEyeCheckService.java index 0557b9f..956796f 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LhBabyEyeCheckService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LhBabyEyeCheckService.java @@ -5,9 +5,7 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.pojo.BabyOralCheck; import com.lyms.platform.pojo.LhBabyEyeCheck; -import com.lyms.platform.query.BabyOralCheckQuery; import com.lyms.platform.query.LhBabyEyelCheckQuery; import org.apache.commons.lang.StringUtils; import org.springframework.data.domain.Sort; 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 b8d7bfa..1035a29 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 @@ -4,12 +4,9 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.operate.web.facade.BabyOralCheckFacade; import com.lyms.platform.operate.web.facade.LhBabyEyeCheckFacade; -import com.lyms.platform.pojo.BabyOralCheck; import com.lyms.platform.pojo.LhBabyEyeCheck; import com.lyms.platform.query.BabyModelQuery; -import com.lyms.platform.query.BabyOralCheckQuery; import com.lyms.platform.query.LhBabyEyelCheckQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -105,9 +102,9 @@ public class LhBabyEyeCheckController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/queryAllBabyListPage",method = RequestMethod.GET) - public BaseResponse queryBabyOralListPage(BabyModelQuery babyModelQuery, HttpServletRequest request) { + public BaseResponse queryBabyEyeListPage(BabyModelQuery babyModelQuery, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return lhBabyEyeCheckFacade.queryBabyOralListPage(babyModelQuery,loginState.getId()); + return lhBabyEyeCheckFacade.queryBabyEyeListPage(babyModelQuery,loginState.getId()); } 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 597b044..99c0701 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,7 +1,6 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.BabyBookbuildingService; -import com.lyms.platform.biz.service.BabyOralCheckService; import com.lyms.platform.biz.service.LhBabyEyeCheckService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; @@ -17,11 +16,10 @@ import com.lyms.platform.operate.web.utils.MongoUtil; 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.BabyEyeCheck; import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.pojo.BabyOralCheck; import com.lyms.platform.pojo.LhBabyEyeCheck; import com.lyms.platform.query.BabyModelQuery; -import com.lyms.platform.query.BabyOralCheckQuery; import com.lyms.platform.query.LhBabyEyelCheckQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -96,7 +94,7 @@ public class LhBabyEyeCheckFacade { babyCheck.setOperaterId(userid+""); babyCheck.setModified(new Date()); lhBabyEyeCheckService.update(babyCheck); - BabyOralCheck Check = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyCheck.getId())), BabyOralCheck.class); + BabyEyeCheck Check = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyCheck.getId())), BabyEyeCheck.class); if (null!=Check) { operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), Check, OptActionEnums.UPDATE.getId(), "修改眼健康检查"); } @@ -262,9 +260,9 @@ public class LhBabyEyeCheckFacade { request.setChuPositiveType("2"); request.setPositiveType("1"); } - List babyOralChecks=lhBabyEyeCheckService.queryList(request,Sort.Direction.DESC,"eyeCheckTime"); + List babyEyeChecks=lhBabyEyeCheckService.queryList(request,Sort.Direction.DESC,"eyeCheckTime"); List result=new ArrayList<>(); - for (LhBabyEyeCheck babyCheck : babyOralChecks) { + for (LhBabyEyeCheck babyCheck : babyEyeChecks) { Map map=ReflectionUtils.beanToMap(babyCheck);//对象转map map.put("sex",SexEnum.getTextById(babyCheck.getBabySex())); map.put("eyeCheckDoctor",couponMapper.getUserName(babyCheck.getEyeCheckDoctor())); @@ -278,7 +276,7 @@ public class LhBabyEyeCheckFacade { return br; } - public BaseResponse queryBabyOralListPage(BabyModelQuery babyModelQuery, Integer userId) { + public BaseResponse queryBabyEyeListPage(BabyModelQuery babyModelQuery, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); babyModelQuery.setNeed("true"); babyModelQuery.setYn(YnEnums.YES.getId());