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 652dbb3..b8e4fb9 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 @@ -169,7 +169,7 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse queryAbnormalWeight(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryAbnormalWeight(patientsQueryRequest, loginState.getId()); + return patientFacade.queryAbnormalWeight(patientsQueryRequest, loginState.getId(),"true"); } /** * 巨大儿管理 @@ -181,7 +181,7 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse queryGiantWeight(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryGiantWeight(patientsQueryRequest, loginState.getId()); + return patientFacade.queryGiantWeight(patientsQueryRequest, loginState.getId(),"true"); } /** * 孕期体重异常管理 导出 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 2b08061..cb09605 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 @@ -747,9 +747,10 @@ public class PatientFacade { * @param riskPatientsQueryRequest * @return */ - public BaseResponse queryAbnormalWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer userId) { + public BaseResponse queryAbnormalWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer userId,String need) { String hospital = autoMatchFacade.getHospitalId(userId); + PatientsQuery pq = new PatientsQuery(); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(1); @@ -783,24 +784,26 @@ public class PatientFacade { } if(CollectionUtils.isNotEmpty(ids)) { //获取bmi大于 25 &筛选bmi条件 - PatientsQuery pq = new PatientsQuery(); pq.setIds(ids); pq.setPage(riskPatientsQueryRequest.getPage()); pq.setLimit(riskPatientsQueryRequest.getLimit()); + if(StringUtils.isNotEmpty(need)){ + pq.setNeed(need); + } List ps = patientsService.queryPatientBySort(pq, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); if (CollectionUtils.isNotEmpty(ps)) { data = convertToQuanWeight(ps,null); } } } - return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo()); + return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(pq.getPageInfo()); } /** * 巨大儿管理 * @param riskPatientsQueryRequest * @return */ - public BaseResponse queryGiantWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer userId) { + public BaseResponse queryGiantWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer userId,String need) { //分娩档案 String hospital = autoMatchFacade.getHospitalId(userId); @@ -876,6 +879,9 @@ public class PatientFacade { pq.setIds(CollectionUtils.isEmpty(idsPW)? idsMd : idsPW); pq.setPage(riskPatientsQueryRequest.getPage()); pq.setLimit(riskPatientsQueryRequest.getLimit()); + if(StringUtils.isNotEmpty(need)){ + pq.setNeed(need); + } List ps = patientsService.queryPatientBySort(pq, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder()); if(CollectionUtils.isNotEmpty(ps)){ data = convertToQuanWeight(ps,"judaer");//judaer巨大儿管理 @@ -888,7 +894,7 @@ public class PatientFacade { public void exportQueryAbnormalWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer id, HttpServletResponse response) { try { - BaseListResponse listResponse = (BaseListResponse) queryAbnormalWeight(riskPatientsQueryRequest, id); + BaseListResponse listResponse = (BaseListResponse) queryAbnormalWeight(riskPatientsQueryRequest, id,null); List list = listResponse.getData(); List> datas = new ArrayList<>(); @@ -940,7 +946,7 @@ public class PatientFacade { public void exportQueryGiantWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer id, HttpServletResponse response) { try { - BaseListResponse listResponse = (BaseListResponse) queryGiantWeight(riskPatientsQueryRequest, id); + BaseListResponse listResponse = (BaseListResponse) queryGiantWeight(riskPatientsQueryRequest, id,null); List list = listResponse.getData(); List> datas = new ArrayList<>();