From 3d292ba6f0a6404df93d79f27ec03b87a2ce3cfb Mon Sep 17 00:00:00 2001 From: haorp <754760654@qq.com> Date: Wed, 28 May 2025 16:32:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=AD=A6=E6=A0=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/PuerperaManageController.java | 22 +++++++++++++++++++--- .../platform/operate/web/facade/CourseFacade.java | 10 ++++++---- 2 files changed, 25 insertions(+), 7 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 3045cb6..2f63139 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 @@ -110,11 +110,27 @@ public class PuerperaManageController extends BaseController { */ @RequestMapping(value = "/allPats", method = RequestMethod.GET) @ResponseBody - @TokenRequired +// @TokenRequired public BaseResponse queryAllPatPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); +// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); // patientsQueryRequest.setAllPats("allPats"); - return patientFacade.queryHighRisk1(patientsQueryRequest, null, null, loginState.getId(), patientsQueryRequest.getNeedPage(), Boolean.FALSE); + return patientFacade.queryHighRisk1(patientsQueryRequest, null, null, 2100013059, patientsQueryRequest.getNeedPage(), Boolean.FALSE); + } + + + /** + * 查询所有包括孕妇和产妇 + * + * @param patientsQueryRequest + * @param request + * @return + */ + @RequestMapping(value = "/queryHighRiskStatistics", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryHighRiskStatistics(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return patientFacade.queryHighRiskStatistics(patientsQueryRequest, null, null, loginState.getId(), patientsQueryRequest.getNeedPage(), Boolean.FALSE); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index 3266be5..64f0c8b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -752,7 +752,7 @@ public class CourseFacade { String startTime = null; String endTime = null; //孕妇听课率=总签到人数/建档人数*100 - if(!Strings.isNullOrEmpty(hospitalId)&&"1000000115".equals(hospitalId)){ +/* if(!Strings.isNullOrEmpty(hospitalId)&&"1000000115".equals(hospitalId)){ PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setHospitalId(hospitalId); patientsQuery.setExtEnable(false); @@ -791,7 +791,7 @@ public class CourseFacade { totalData.put("lessonsRate",patientsList!=null ? signsNum+","+patientsList.size(): "0");//听课率 - } + }*/ @@ -803,11 +803,13 @@ public class CourseFacade { if (!Strings.isNullOrEmpty(time)) { + String[] dates = time.split(" - "); + startTime = dates[0]; query.setPublishTimeStart(DateUtil.parseYMD(startTime)); - if (endTime!=null) { + if (dates.length == 2) { + endTime = dates[1]; query.setPublishTimeEnd(DateUtil.parseYMDHMS(endTime + " 23:59:59")); } - } List courseModelList = courseService.queryCourseList(query); -- 1.8.3.1