From 5a9b385ceca782db2ea63f6a2df942ae6170cd2c Mon Sep 17 00:00:00 2001 From: "jesse.wang" Date: Thu, 13 Apr 2023 15:14:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A4=E7=8B=AC=E7=97=87=E5=88=9D=E7=AD=9B?= =?UTF-8?q?=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/master/BabyAutismPrimaryScreeningMapper.java | 4 ++-- .../service/BabyAutismPrimaryScreeningService.java | 7 +++---- .../impl/BabyAutismPrimaryScreeningServiceImpl.java | 10 ++++------ .../com/lyms/platform/pojo/BabyAutismDoubleSieving.java | 10 ++++++++++ .../web/controller/PrimaryScreeningController.java | 6 ++---- .../operate/web/facade/PrimaryScreeningFacade.java | 17 +++++++---------- 6 files changed, 28 insertions(+), 26 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismPrimaryScreeningMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismPrimaryScreeningMapper.java index b8e2b00..541e03d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismPrimaryScreeningMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyAutismPrimaryScreeningMapper.java @@ -1,8 +1,8 @@ package com.lyms.platform.permission.dao.master; +import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.pojo.BabyAutismPrimaryScreening; import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.Pageable; import java.util.List; @@ -29,7 +29,7 @@ public interface BabyAutismPrimaryScreeningMapper { * @param pageable 分页对象 * @return 对象列表 */ - List queryAllByLimit(BabyAutismPrimaryScreening babyAutismPrimaryScreening, @Param("pageable") Pageable pageable); + List queryAllByLimit(BabyAutismPrimaryScreening babyAutismPrimaryScreening, @Param("pageable") BaseQuery pageable); /** * 统计总行数 diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismPrimaryScreeningService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismPrimaryScreeningService.java index 5901b50..621b680 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismPrimaryScreeningService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyAutismPrimaryScreeningService.java @@ -1,8 +1,7 @@ package com.lyms.platform.permission.service; +import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.pojo.BabyAutismPrimaryScreening; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import java.util.List; @@ -26,10 +25,10 @@ public interface BabyAutismPrimaryScreeningService { * 分页查询 * * @param babyAutismPrimaryScreening 筛选条件 - * @param pageRequest 分页对象 + * @param pageRequest 分页对象 * @return 查询结果 */ - Page queryByPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, PageRequest pageRequest); + List queryByPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest); /** * 新增数据 diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismPrimaryScreeningServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismPrimaryScreeningServiceImpl.java index 7b4f1ab..079f179 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismPrimaryScreeningServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyAutismPrimaryScreeningServiceImpl.java @@ -1,11 +1,9 @@ package com.lyms.platform.permission.service.impl; +import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.permission.dao.master.BabyAutismPrimaryScreeningMapper; import com.lyms.platform.permission.service.BabyAutismPrimaryScreeningService; import com.lyms.platform.pojo.BabyAutismPrimaryScreening; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -37,13 +35,13 @@ public class BabyAutismPrimaryScreeningServiceImpl implements BabyAutismPrimaryS * 分页查询 * * @param babyAutismPrimaryScreening 筛选条件 - * @param pageRequest 分页对象 + * @param pageRequest 分页对象 * @return 查询结果 */ @Override - public Page queryByPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, PageRequest pageRequest) { + public List queryByPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest) { long total = this.babyAutismPrimaryScreeningDao.count(babyAutismPrimaryScreening); - return new PageImpl<>(this.babyAutismPrimaryScreeningDao.queryAllByLimit(babyAutismPrimaryScreening, pageRequest), pageRequest, total); + return this.babyAutismPrimaryScreeningDao.queryAllByLimit(babyAutismPrimaryScreening, pageRequest); } /** diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java index 01e8047..1e2f810 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java @@ -116,6 +116,16 @@ public class BabyAutismDoubleSieving extends BaseModel { private String errormsg; + private String checkHospital; + + public String getCheckHospital() { + return checkHospital; + } + + public void setCheckHospital(String checkHospital) { + this.checkHospital = checkHospital; + } + /** * 医生签名 */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java index 7950d3a..83cdb64 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java @@ -4,6 +4,7 @@ import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.BaseMap; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.RespBuilder; @@ -14,7 +15,6 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -138,9 +138,7 @@ public class PrimaryScreeningController extends BaseController { } } } - primaryScreening.setWarningSigns(warningSigns); primaryScreening.setWarningSignstringName(StringUtils.join(warningSigns,",")); - primaryScreening.setLanguageSocial(languageSocial); primaryScreening.setLanguageSocialName(StringUtils.join(languageSocial,",")); BaseObjectResponse br = new BaseObjectResponse(); br.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -153,7 +151,7 @@ public class PrimaryScreeningController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/queryDateListPage", method = RequestMethod.GET) - public BaseResponse queryDateListPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, PageRequest pageRequest, HttpServletRequest request) { + public BaseResponse queryDateListPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest, HttpServletRequest request) { return primaryScreeningFacade.queryDateListPage(babyAutismPrimaryScreening, pageRequest, getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java index 64255e4..cb43b94 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java @@ -1,8 +1,8 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.common.base.BaseMap; -import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.enums.EyeCheckMonthEnums; import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.enums.YnEnums; @@ -22,8 +22,6 @@ import com.lyms.platform.pojo.BabyModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.stereotype.Component; @@ -158,8 +156,8 @@ public class PrimaryScreeningFacade extends BaseServiceImpl { return primaryScreening; } - public BaseResponse queryDateListPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, PageRequest pageRequest, Integer id) { - Page primaryScreeningPage = babyAutismPrimaryScreeningService.queryByPage(babyAutismPrimaryScreening, pageRequest); + public BaseResponse queryDateListPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest, Integer id) { + List primaryScreeningPage = babyAutismPrimaryScreeningService.queryByPage(babyAutismPrimaryScreening, pageRequest); for (BabyAutismPrimaryScreening primaryScreening : primaryScreeningPage) { String checkMonthId = primaryScreening.getCheckMonthId(); HashMap> monthageInfo = InitDataConfig.MONTHAGEINFO.get(Integer.valueOf(checkMonthId)); @@ -188,15 +186,14 @@ public class PrimaryScreeningFacade extends BaseServiceImpl { } } } - primaryScreening.setWarningSigns(warningSigns); - primaryScreening.setLanguageSocial(languageSocial); + primaryScreening.setWarningSignstringName(org.apache.commons.lang.StringUtils.join(warningSigns,",")); + primaryScreening.setLanguageSocialName(org.apache.commons.lang.StringUtils.join(languageSocial,",")); } BaseObjectResponse br = new BaseObjectResponse(); br.setErrorcode(ErrorCodeConstants.SUCCESS); - br.setData(primaryScreeningPage.getContent()); - PageInfo pageInfo = new PageInfo(primaryScreeningPage.getNumber(), primaryScreeningPage.getTotalPages(), Long.valueOf(primaryScreeningPage.getTotalElements()).intValue(), pageRequest.getPageSize()); - br.setPageInfo(pageInfo); + br.setData(primaryScreeningPage); + br.setPageInfo(pageRequest.getPageInfo()); br.setErrormsg("成功"); return br; } -- 1.8.3.1