jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 96fd3fea2535c56adc2301a7e2f3fe2c1150a2b3

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

update

Showing 5 changed files with 71 additions and 25 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/ReflectionUtils.java View file @ 96fd3fe
... ... @@ -37,6 +37,11 @@
37 37 new Object[]{});
38 38 }
39 39  
  40 + /**s
  41 + * 对象转map
  42 + * @param obj
  43 + * @return
  44 + */
40 45 public static Map<String, Object> beanToMap(Object obj) {
41 46 if (obj == null) {
42 47 return null;
platform-dal/src/main/java/com/lyms/platform/pojo/BabyOralCheck.java View file @ 96fd3fe
... ... @@ -52,10 +52,18 @@
52 52 */
53 53 private String babyId;
54 54 /**
  55 + * 儿童建档日期
  56 + */
  57 + private Date babyBuildDate;
  58 + /**
55 59 * 儿童姓名
56 60 */
57 61 private String babyName;
58 62 /**
  63 + * 儿童姓名
  64 + */
  65 + private Integer babySex;
  66 + /**
59 67 * 母亲姓名
60 68 */
61 69 private String babyMName;
... ... @@ -278,6 +286,22 @@
278 286  
279 287 public Date getBirth() {
280 288 return birth;
  289 + }
  290 +
  291 + public Date getBabyBuildDate() {
  292 + return babyBuildDate;
  293 + }
  294 +
  295 + public Integer getBabySex() {
  296 + return babySex;
  297 + }
  298 +
  299 + public void setBabySex(Integer babySex) {
  300 + this.babySex = babySex;
  301 + }
  302 +
  303 + public void setBabyBuildDate(Date babyBuildDate) {
  304 + this.babyBuildDate = babyBuildDate;
281 305 }
282 306  
283 307 public void setBirth(Date birth) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyOralCheckController.java View file @ 96fd3fe
... ... @@ -10,6 +10,7 @@
10 10 import com.lyms.platform.operate.web.request.*;
11 11 import com.lyms.platform.pojo.BabyEyeCheck;
12 12 import com.lyms.platform.pojo.BabyOralCheck;
  13 +import com.lyms.platform.query.BabyModelQuery;
13 14 import com.lyms.platform.query.BabyOralCheckQuery;
14 15 import org.springframework.beans.factory.annotation.Autowired;
15 16 import org.springframework.stereotype.Controller;
... ... @@ -96,6 +97,19 @@
96 97 public BaseResponse queryDateListPage(BabyOralCheckQuery babyOralCheckQuery, HttpServletRequest request) {
97 98 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
98 99 return babyOralCheckFacade.queryDateListPage(babyOralCheckQuery,loginState.getId());
  100 + }
  101 + /**
  102 + * 儿童口腔管理
  103 + * @param babyModelQuery
  104 + * @param request
  105 + * @return
  106 + */
  107 + @ResponseBody
  108 + @TokenRequired
  109 + @RequestMapping(value = "/queryBabyOralListPage",method = RequestMethod.GET)
  110 + public BaseResponse queryBabyOralListPage(BabyModelQuery babyModelQuery, HttpServletRequest request) {
  111 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  112 + return babyOralCheckFacade.queryBabyOralListPage(babyModelQuery,loginState.getId());
99 113 }
100 114  
101 115  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java View file @ 96fd3fe
... ... @@ -14,12 +14,11 @@
14 14 import com.lyms.platform.common.utils.MongoConvertHelper;
15 15 import com.lyms.platform.common.utils.ReflectionUtils;
16 16 import com.lyms.platform.common.utils.StringUtils;
17   -import com.lyms.platform.operate.web.request.BabyOralCheckRequest;
18 17 import com.lyms.platform.operate.web.utils.CollectionUtils;
19 18 import com.lyms.platform.operate.web.utils.MongoUtil;
  19 +import com.lyms.platform.permission.dao.master.CouponMapper;
20 20 import com.lyms.platform.permission.model.Organization;
21 21 import com.lyms.platform.permission.service.OrganizationService;
22   -import com.lyms.platform.pojo.BabyEyeCheck;
23 22 import com.lyms.platform.pojo.BabyModel;
24 23 import com.lyms.platform.pojo.BabyOralCheck;
25 24 import com.lyms.platform.query.BabyModelQuery;
... ... @@ -48,6 +47,8 @@
48 47 private OrganizationService organizationService;
49 48 @Autowired
50 49 private BabyOralCheckService babyOralCheckService;
  50 + @Autowired
  51 + private CouponMapper couponMapper;
51 52  
52 53 public BaseResponse addOrUpDate(BabyOralCheck babyOralCheck, Integer userid) {
53 54 //判断阳性检查
... ... @@ -72,6 +73,8 @@
72 73 BabyModel babyModel = mongoTemplate.findById(babyOralCheck.getBabyId(), BabyModel.class);
73 74 if (babyModel != null) {
74 75 babyOralCheck.setPid(babyModel.getPid());
  76 + babyOralCheck.setBabyBuildDate(babyModel.getBuildDate());
  77 + babyOralCheck.setBabySex(babyModel.getSex());
75 78 babyOralCheck.setBirth(babyModel.getBirth());
76 79 babyOralCheck.setBabyName(babyModel.getName());
77 80 babyOralCheck.setBabyMName(babyModel.getMname());
78 81  
79 82  
... ... @@ -221,11 +224,32 @@
221 224 request.setBirthEnd(DateUtil.getBirthStart(request.getQueryMonthAgeEnd()));
222 225 }
223 226 List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(request,Sort.Direction.DESC,"created");
224   -
  227 + List<Map> result=new ArrayList<>();
  228 + for (BabyOralCheck babyOralCheck : babyOralChecks) {
  229 + Map<String,Object> map=ReflectionUtils.beanToMap(babyOralCheck);//对象转map
  230 + map.put("sex",babyOralCheck.getBabySex()==1?"男":"女");
  231 + map.put("oralCheckDoctor",couponMapper.getUserName(babyOralCheck.getOralCheckDoctor()));
  232 + result.add(map);
  233 + }
225 234 BaseObjectResponse br = new BaseObjectResponse();
226 235 br.setErrorcode(ErrorCodeConstants.SUCCESS);
227   - br.setData(babyOralChecks);
  236 + br.setData(result);
228 237 br.setPageInfo(request.getPageInfo());
  238 + br.setErrormsg("成功");
  239 + return br;
  240 + }
  241 +
  242 + public BaseResponse queryBabyOralListPage(BabyModelQuery babyModelQuery, Integer userId) {
  243 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  244 + babyModelQuery.setNeed("true");
  245 + babyModelQuery.setYn(YnEnums.YES.getId());
  246 + babyModelQuery.setHospitalId(hospitalId);
  247 + List<BabyModel> babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery, "oralCheckTime", Sort.Direction.DESC);
  248 +
  249 + BaseObjectResponse br = new BaseObjectResponse();
  250 + br.setErrorcode(ErrorCodeConstants.SUCCESS);
  251 + br.setData(babyModelList);
  252 + br.setPageInfo(babyModelQuery.getPageInfo());
229 253 br.setErrormsg("成功");
230 254 return br;
231 255 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyOralCheckRequest.java View file @ 96fd3fe
1   -package com.lyms.platform.operate.web.request;
2   -
3   -import com.lyms.platform.common.core.annotation.form.FormParam;
4   -import com.lyms.platform.common.dao.BaseQuery;
5   -import org.hibernate.validator.constraints.NotEmpty;
6   -
7   -import java.util.Date;
8   -import java.util.List;
9   -import java.util.Map;
10   -
11   -/**
12   - * Created by lqy on 2022/3/17.
13   - * 儿童口腔检查
14   - */
15   -public class BabyOralCheckRequest extends BaseQuery {
16   - //检查日期
17   -
18   - //预约时间
19   - //查询号（儿童姓名/证件号/联系方式）
20   - //检查医生
21   -}