From 96fd3fea2535c56adc2301a7e2f3fe2c1150a2b3 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Fri, 18 Mar 2022 15:59:23 +0800 Subject: [PATCH] update --- .../platform/common/utils/ReflectionUtils.java | 5 ++++ .../java/com/lyms/platform/pojo/BabyOralCheck.java | 24 ++++++++++++++++ .../web/controller/BabyOralCheckController.java | 14 ++++++++++ .../operate/web/facade/BabyOralCheckFacade.java | 32 +++++++++++++++++++--- .../operate/web/request/BabyOralCheckRequest.java | 21 -------------- 5 files changed, 71 insertions(+), 25 deletions(-) delete mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyOralCheckRequest.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ReflectionUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ReflectionUtils.java index 7c76ee8..5500d1b 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ReflectionUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ReflectionUtils.java @@ -37,6 +37,11 @@ public class ReflectionUtils { new Object[]{}); } + /**s + * 对象转map + * @param obj + * @return + */ public static Map beanToMap(Object obj) { if (obj == null) { return null; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyOralCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyOralCheck.java index f80f12c..2077963 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyOralCheck.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyOralCheck.java @@ -52,10 +52,18 @@ public class BabyOralCheck extends BaseModel { */ private String babyId; /** + * 儿童建档日期 + */ + private Date babyBuildDate; + /** * 儿童姓名 */ private String babyName; /** + * 儿童姓名 + */ + private Integer babySex; + /** * 母亲姓名 */ private String babyMName; @@ -280,6 +288,22 @@ public class BabyOralCheck extends BaseModel { return birth; } + public Date getBabyBuildDate() { + return babyBuildDate; + } + + public Integer getBabySex() { + return babySex; + } + + public void setBabySex(Integer babySex) { + this.babySex = babySex; + } + + public void setBabyBuildDate(Date babyBuildDate) { + this.babyBuildDate = babyBuildDate; + } + public void setBirth(Date birth) { this.birth = birth; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyOralCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyOralCheckController.java index 9a635d2..c856f32 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyOralCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyOralCheckController.java @@ -10,6 +10,7 @@ import com.lyms.platform.operate.web.facade.BabyOralCheckFacade; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.pojo.BabyEyeCheck; import com.lyms.platform.pojo.BabyOralCheck; +import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.BabyOralCheckQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -97,6 +98,19 @@ public class BabyOralCheckController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return babyOralCheckFacade.queryDateListPage(babyOralCheckQuery,loginState.getId()); } + /** + * 儿童口腔管理 + * @param babyModelQuery + * @param request + * @return + */ + @ResponseBody + @TokenRequired + @RequestMapping(value = "/queryBabyOralListPage",method = RequestMethod.GET) + public BaseResponse queryBabyOralListPage(BabyModelQuery babyModelQuery, HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return babyOralCheckFacade.queryBabyOralListPage(babyModelQuery,loginState.getId()); + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java index fcee483..722bcf0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java @@ -14,12 +14,11 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.MongoConvertHelper; import com.lyms.platform.common.utils.ReflectionUtils; import com.lyms.platform.common.utils.StringUtils; -import com.lyms.platform.operate.web.request.BabyOralCheckRequest; import com.lyms.platform.operate.web.utils.CollectionUtils; 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.query.BabyModelQuery; @@ -48,6 +47,8 @@ public class BabyOralCheckFacade { private OrganizationService organizationService; @Autowired private BabyOralCheckService babyOralCheckService; + @Autowired + private CouponMapper couponMapper; public BaseResponse addOrUpDate(BabyOralCheck babyOralCheck, Integer userid) { //判断阳性检查 @@ -72,6 +73,8 @@ public class BabyOralCheckFacade { BabyModel babyModel = mongoTemplate.findById(babyOralCheck.getBabyId(), BabyModel.class); if (babyModel != null) { babyOralCheck.setPid(babyModel.getPid()); + babyOralCheck.setBabyBuildDate(babyModel.getBuildDate()); + babyOralCheck.setBabySex(babyModel.getSex()); babyOralCheck.setBirth(babyModel.getBirth()); babyOralCheck.setBabyName(babyModel.getName()); babyOralCheck.setBabyMName(babyModel.getMname()); @@ -221,12 +224,33 @@ public class BabyOralCheckFacade { request.setBirthEnd(DateUtil.getBirthStart(request.getQueryMonthAgeEnd())); } List babyOralChecks=babyOralCheckService.queryList(request,Sort.Direction.DESC,"created"); - + List result=new ArrayList<>(); + for (BabyOralCheck babyOralCheck : babyOralChecks) { + Map map=ReflectionUtils.beanToMap(babyOralCheck);//对象转map + map.put("sex",babyOralCheck.getBabySex()==1?"男":"女"); + map.put("oralCheckDoctor",couponMapper.getUserName(babyOralCheck.getOralCheckDoctor())); + result.add(map); + } BaseObjectResponse br = new BaseObjectResponse(); br.setErrorcode(ErrorCodeConstants.SUCCESS); - br.setData(babyOralChecks); + br.setData(result); br.setPageInfo(request.getPageInfo()); br.setErrormsg("成功"); return br; } + + public BaseResponse queryBabyOralListPage(BabyModelQuery babyModelQuery, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + babyModelQuery.setNeed("true"); + babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setHospitalId(hospitalId); + List babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery, "oralCheckTime", Sort.Direction.DESC); + + BaseObjectResponse br = new BaseObjectResponse(); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setData(babyModelList); + br.setPageInfo(babyModelQuery.getPageInfo()); + br.setErrormsg("成功"); + return br; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyOralCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyOralCheckRequest.java deleted file mode 100644 index e7d74b7..0000000 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyOralCheckRequest.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.lyms.platform.operate.web.request; - -import com.lyms.platform.common.core.annotation.form.FormParam; -import com.lyms.platform.common.dao.BaseQuery; -import org.hibernate.validator.constraints.NotEmpty; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * Created by lqy on 2022/3/17. - * 儿童口腔检查 - */ -public class BabyOralCheckRequest extends BaseQuery { - //检查日期 - - //预约时间 - //查询号（儿童姓名/证件号/联系方式） - //检查医生 -} -- 1.8.3.1