From 2a591085c8c2c274587635dc99fe81bb3997ade1 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 15 Aug 2024 15:44:09 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E9=AB=98=E5=8D=B1?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/PuerperaManageController.java | 2 +- .../lyms/platform/operate/web/facade/PatientFacade.java | 16 ++++++++++------ .../com/lyms/platform/operate/web/worker/WorkHR.java | 6 +++--- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index eafe166..a7dcf8a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -113,7 +113,7 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse queryAllPatPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryHighRisk1(patientsQueryRequest, null, null, loginState.getId(), "true", Boolean.FALSE); + return patientFacade.queryHighRisk1(patientsQueryRequest, null, null, loginState.getId(), null, Boolean.FALSE); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 4545088..60f8479 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -752,7 +752,7 @@ public class PatientFacade extends BaseServiceImpl { if (CollectionUtils.isNotEmpty(patientses)) { //如果是查高危孕妇 if (null != isHighRisk && Boolean.TRUE.equals(isHighRisk)) { - data = convertToHighRisk(patientses, userId, hospital,null,null); + data = convertToHighRisk(patientses, userId, hospital,null); } else if (type == 1) { //处理全部孕妇的情况 data = convertToQuanPatient(patientses, userId, hospital); @@ -2042,6 +2042,9 @@ public class PatientFacade extends BaseServiceImpl { public BaseResponse queryHighRisk1(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) { String hospital = autoMatchFacade.getHospitalId(userId); + if (!"2100002419".equals(hospital)){ + needPage="true"; + } //组合请求 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion,hospital); @@ -2053,13 +2056,14 @@ public class PatientFacade extends BaseServiceImpl { //logger.info(stopWatch.toString()); List data = new ArrayList <>(); - PageInfo pageInfo= patientsQuery.getPageInfo(); + // PageInfo pageInfo= patientsQuery.getPageInfo(); if (CollectionUtils.isNotEmpty(patientses)) { //如果是查高危孕妇 - data = convertToHighRisk(patientses, userId, hospital,riskPatientsQueryRequest.getrLevel(),pageInfo); + data = convertToHighRisk(patientses, userId, hospital,riskPatientsQueryRequest.getrLevel()); // pageInfo.setCount(data.size()); } - return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(pageInfo); + + return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo()); } public BaseResponse findPatient(PatientQueryRequest patientQueryRequest, Integer userId) { @@ -2380,7 +2384,7 @@ public class PatientFacade extends BaseServiceImpl { * @param patientses * @return */ - private List convertToHighRisk(List patientses, Integer userId, String hospital,String level,PageInfo pageInfo) { + private List convertToHighRisk(List patientses, Integer userId, String hospital,String level) { List data = new ArrayList <>(); int batchSize = 4; int end = 0; @@ -2391,7 +2395,7 @@ public class PatientFacade extends BaseServiceImpl { end = patientses.size(); } listFuture.add(commonThreadPool.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService, organizationService, - couponService,level,pageInfo))); + couponService,level))); } for (Future f : listFuture) { try { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java index 57954ef..6797d9b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java @@ -56,13 +56,12 @@ public class WorkHR implements Callable> { private CouponService couponService; private OrganizationService organizationService; private String level; - private PageInfo pageInfo; public WorkHR(List patientses, UsersService usersService, String hospital, BasicConfigService basicConfigService, AntenatalExaminationService antExService, PatientsService patientsService, OrganizationService organizationService, - CouponService couponService,String level,PageInfo pageInfo) { + CouponService couponService,String level) { this.couponService = couponService; this.patientses = patientses; this.usersService = usersService; @@ -72,7 +71,6 @@ public class WorkHR implements Callable> { this.patientsService = patientsService; this.organizationService = organizationService; this.level=level; - this.pageInfo=pageInfo; } public List call() { @@ -105,7 +103,9 @@ public class WorkHR implements Callable> { } } if (b){ + /* stopWatch.start("pageInfo getCount level"); pageInfo.setCount(pageInfo.getCount()-1); + stopWatch.stop();*/ continue; } } -- 1.8.3.1