jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 5a9b385ceca782db2ea63f6a2df942ae6170cd2c

Authored by jesse.wang
1 parent fbfd270df7
Exists in master and in 4 other branches autism, dev, fengning2023-06-06, luanping

孤独症初筛名字

Showing 6 changed files with 28 additions and 26 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismPrimaryScreeningMapper.java View file @ 5a9b385
1 1 package com.lyms.platform.permission.dao.master;
2 2  
  3 +import com.lyms.platform.common.dao.BaseQuery;
3 4 import com.lyms.platform.pojo.BabyAutismPrimaryScreening;
4 5 import org.apache.ibatis.annotations.Param;
5   -import org.springframework.data.domain.Pageable;
6 6  
7 7 import java.util.List;
8 8  
... ... @@ -29,7 +29,7 @@
29 29 * @param pageable 分页对象
30 30 * @return 对象列表
31 31 */
32   - List<BabyAutismPrimaryScreening> queryAllByLimit(BabyAutismPrimaryScreening babyAutismPrimaryScreening, @Param("pageable") Pageable pageable);
  32 + List<BabyAutismPrimaryScreening> queryAllByLimit(BabyAutismPrimaryScreening babyAutismPrimaryScreening, @Param("pageable") BaseQuery pageable);
33 33  
34 34 /**
35 35 * 统计总行数
platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismPrimaryScreeningService.java View file @ 5a9b385
1 1 package com.lyms.platform.permission.service;
2 2  
  3 +import com.lyms.platform.common.dao.BaseQuery;
3 4 import com.lyms.platform.pojo.BabyAutismPrimaryScreening;
4   -import org.springframework.data.domain.Page;
5   -import org.springframework.data.domain.PageRequest;
6 5  
7 6 import java.util.List;
8 7  
9 8  
... ... @@ -26,10 +25,10 @@
26 25 * 分页查询
27 26 *
28 27 * @param babyAutismPrimaryScreening 筛选条件
29   - * @param pageRequest 分页对象
  28 + * @param pageRequest 分页对象
30 29 * @return 查询结果
31 30 */
32   - Page<BabyAutismPrimaryScreening> queryByPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, PageRequest pageRequest);
  31 + List<BabyAutismPrimaryScreening> queryByPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest);
33 32  
34 33 /**
35 34 * 新增数据
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismPrimaryScreeningServiceImpl.java View file @ 5a9b385
1 1 package com.lyms.platform.permission.service.impl;
2 2  
  3 +import com.lyms.platform.common.dao.BaseQuery;
3 4 import com.lyms.platform.permission.dao.master.BabyAutismPrimaryScreeningMapper;
4 5 import com.lyms.platform.permission.service.BabyAutismPrimaryScreeningService;
5 6 import com.lyms.platform.pojo.BabyAutismPrimaryScreening;
6   -import org.springframework.data.domain.Page;
7   -import org.springframework.data.domain.PageImpl;
8   -import org.springframework.data.domain.PageRequest;
9 7 import org.springframework.stereotype.Service;
10 8  
11 9 import javax.annotation.Resource;
12 10  
13 11  
... ... @@ -37,13 +35,13 @@
37 35 * 分页查询
38 36 *
39 37 * @param babyAutismPrimaryScreening 筛选条件
40   - * @param pageRequest 分页对象
  38 + * @param pageRequest 分页对象
41 39 * @return 查询结果
42 40 */
43 41 @Override
44   - public Page<BabyAutismPrimaryScreening> queryByPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, PageRequest pageRequest) {
  42 + public List<BabyAutismPrimaryScreening> queryByPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest) {
45 43 long total = this.babyAutismPrimaryScreeningDao.count(babyAutismPrimaryScreening);
46   - return new PageImpl<>(this.babyAutismPrimaryScreeningDao.queryAllByLimit(babyAutismPrimaryScreening, pageRequest), pageRequest, total);
  44 + return this.babyAutismPrimaryScreeningDao.queryAllByLimit(babyAutismPrimaryScreening, pageRequest);
47 45 }
48 46  
49 47 /**
platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java View file @ 5a9b385
... ... @@ -116,6 +116,16 @@
116 116  
117 117 private String errormsg;
118 118  
  119 + private String checkHospital;
  120 +
  121 + public String getCheckHospital() {
  122 + return checkHospital;
  123 + }
  124 +
  125 + public void setCheckHospital(String checkHospital) {
  126 + this.checkHospital = checkHospital;
  127 + }
  128 +
119 129 /**
120 130 * 医生签名
121 131 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java View file @ 5a9b385
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.common.base.BaseController;
5 5 import com.lyms.platform.common.base.BaseMap;
6 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
  7 +import com.lyms.platform.common.dao.BaseQuery;
7 8 import com.lyms.platform.common.result.BaseObjectResponse;
8 9 import com.lyms.platform.common.result.BaseResponse;
9 10 import com.lyms.platform.common.result.RespBuilder;
... ... @@ -14,7 +15,6 @@
14 15 import org.slf4j.Logger;
15 16 import org.slf4j.LoggerFactory;
16 17 import org.springframework.beans.factory.annotation.Autowired;
17   -import org.springframework.data.domain.PageRequest;
18 18 import org.springframework.stereotype.Controller;
19 19 import org.springframework.web.bind.annotation.*;
20 20  
21 21  
... ... @@ -138,9 +138,7 @@
138 138 }
139 139 }
140 140 }
141   - primaryScreening.setWarningSigns(warningSigns);
142 141 primaryScreening.setWarningSignstringName(StringUtils.join(warningSigns,","));
143   - primaryScreening.setLanguageSocial(languageSocial);
144 142 primaryScreening.setLanguageSocialName(StringUtils.join(languageSocial,","));
145 143 BaseObjectResponse br = new BaseObjectResponse();
146 144 br.setErrorcode(ErrorCodeConstants.SUCCESS);
... ... @@ -153,7 +151,7 @@
153 151 @ResponseBody
154 152 @TokenRequired
155 153 @RequestMapping(value = "/queryDateListPage", method = RequestMethod.GET)
156   - public BaseResponse queryDateListPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, PageRequest pageRequest, HttpServletRequest request) {
  154 + public BaseResponse queryDateListPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest, HttpServletRequest request) {
157 155 return primaryScreeningFacade.queryDateListPage(babyAutismPrimaryScreening, pageRequest, getUserId(request));
158 156 }
159 157  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java View file @ 5a9b385
1 1 package com.lyms.platform.operate.web.facade;
2 2  
3 3 import com.lyms.platform.common.base.BaseMap;
4   -import com.lyms.platform.common.base.PageInfo;
5 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
  5 +import com.lyms.platform.common.dao.BaseQuery;
6 6 import com.lyms.platform.common.enums.EyeCheckMonthEnums;
7 7 import com.lyms.platform.common.enums.SexEnum;
8 8 import com.lyms.platform.common.enums.YnEnums;
... ... @@ -22,8 +22,6 @@
22 22 import org.slf4j.Logger;
23 23 import org.slf4j.LoggerFactory;
24 24 import org.springframework.beans.factory.annotation.Autowired;
25   -import org.springframework.data.domain.Page;
26   -import org.springframework.data.domain.PageRequest;
27 25 import org.springframework.data.mongodb.core.MongoTemplate;
28 26 import org.springframework.stereotype.Component;
29 27  
... ... @@ -158,8 +156,8 @@
158 156 return primaryScreening;
159 157 }
160 158  
161   - public BaseResponse queryDateListPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, PageRequest pageRequest, Integer id) {
162   - Page<BabyAutismPrimaryScreening> primaryScreeningPage = babyAutismPrimaryScreeningService.queryByPage(babyAutismPrimaryScreening, pageRequest);
  159 + public BaseResponse queryDateListPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest, Integer id) {
  160 + List<BabyAutismPrimaryScreening> primaryScreeningPage = babyAutismPrimaryScreeningService.queryByPage(babyAutismPrimaryScreening, pageRequest);
163 161 for (BabyAutismPrimaryScreening primaryScreening : primaryScreeningPage) {
164 162 String checkMonthId = primaryScreening.getCheckMonthId();
165 163 HashMap<String, List<BaseMap>> monthageInfo = InitDataConfig.MONTHAGEINFO.get(Integer.valueOf(checkMonthId));
166 164  
... ... @@ -188,15 +186,14 @@
188 186 }
189 187 }
190 188 }
191   - primaryScreening.setWarningSigns(warningSigns);
192   - primaryScreening.setLanguageSocial(languageSocial);
  189 + primaryScreening.setWarningSignstringName(org.apache.commons.lang.StringUtils.join(warningSigns,","));
  190 + primaryScreening.setLanguageSocialName(org.apache.commons.lang.StringUtils.join(languageSocial,","));
193 191  
194 192 }
195 193 BaseObjectResponse br = new BaseObjectResponse();
196 194 br.setErrorcode(ErrorCodeConstants.SUCCESS);
197   - br.setData(primaryScreeningPage.getContent());
198   - PageInfo pageInfo = new PageInfo(primaryScreeningPage.getNumber(), primaryScreeningPage.getTotalPages(), Long.valueOf(primaryScreeningPage.getTotalElements()).intValue(), pageRequest.getPageSize());
199   - br.setPageInfo(pageInfo);
  195 + br.setData(primaryScreeningPage);
  196 + br.setPageInfo(pageRequest.getPageInfo());
200 197 br.setErrormsg("成功");
201 198 return br;
202 199 }