From 642325220d77e049497d90898841664108889900 Mon Sep 17 00:00:00 2001 From: haorp <754760654@qq.com> Date: Fri, 20 Jun 2025 10:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mainOrm/master/AppointmentMapper.xml | 3 +- .../web/controller/PuerperaManageController.java | 99 +++++++++++++--------- 2 files changed, 59 insertions(+), 43 deletions(-) diff --git a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml index cd7532e..a94a5e3 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml @@ -274,7 +274,8 @@ AND CREATED = #{created} - ORDER BY CREATED DESC + GROUP BY CARD_NO + ORDER BY DELIVERY_TIME DESC 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 66abce2..4fc730a 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 @@ -21,8 +21,10 @@ import com.lyms.platform.operate.web.facade.PatientFacade; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.RareBloodGroupService; +import com.lyms.platform.permission.model.Departments; import com.lyms.platform.permission.model.MedicalRecordVo; import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.AppointmentService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; @@ -509,52 +511,65 @@ public class PuerperaManageController extends BaseController { */ @RequestMapping(value = "/apatients", method = RequestMethod.GET) @ResponseBody - @TokenRequired - public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { - // 未建党标志 - if( "1".equals(patientsQueryRequest.getPatientsType())){ - List data = new ArrayList<>(); - MedicalRecordVo medicalRecordVo = new MedicalRecordVo(); - medicalRecordVo.setNeed("true"); - medicalRecordVo.setLimit(patientsQueryRequest.getLimit()); - medicalRecordVo.setPage(patientsQueryRequest.getPage()); - List medicalRecordVoList = appointmentService.queryList(medicalRecordVo); - if(CollectionUtils.isNotEmpty(medicalRecordVoList)){ - for (MedicalRecordVo recordVo : medicalRecordVoList) { - // 查建档 - PatientsQuery patientsQuery = new PatientsQuery(); - patientsQuery.setCardNo(recordVo.getCardNo()); - patientsQuery.setYn(1); - patientsQuery.setDesc("true"); - patientsQuery.setSort("created"); - List patientsList = patientsService.queryPatient(patientsQuery); - if(CollectionUtils.isNotEmpty(patientsList)){ - continue; +// @TokenRequired + public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest) { +// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + List data = new ArrayList<>(); + MedicalRecordVo medicalRecordVo = new MedicalRecordVo(); + medicalRecordVo.setNeed("true"); + medicalRecordVo.setLimit(patientsQueryRequest.getLimit()); + medicalRecordVo.setPage(patientsQueryRequest.getPage()); + List medicalRecordVoList = appointmentService.queryList(medicalRecordVo); + + if(CollectionUtils.isEmpty(medicalRecordVoList)){ + return new BaseListResponse().setData(medicalRecordVoList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("未查询到有效数据"); + } + + if(CollectionUtils.isNotEmpty(medicalRecordVoList)){ + for (MedicalRecordVo recordVo : medicalRecordVoList) { + QuanChanResult quanChanResult = new QuanChanResult(); + quanChanResult.setCardNo(recordVo.getCardNo()); + quanChanResult.setPhone(recordVo.getPhone()); + quanChanResult.setName(recordVo.getName()); + String age1 = recordVo.getAge().substring(0,8); + Date date = DateUtil.parseYYYYMMDD(age1); + int age = DateUtil.getYearSpace(new Date(),date); + quanChanResult.setAge(age); + quanChanResult.setDueWeek(recordVo.getDeliveryTime()); + Date date2 = DateUtil.parseYMD(recordVo.getDeliveryTime()); + int day= DateUtil.getDays(date2,new Date()); + quanChanResult.setcTime(String.valueOf(day)); + quanChanResult.setMdtrtTag(recordVo.getMdtrtTag()); + quanChanResult.setRealPhone(recordVo.getPhone()); + // 查建档 + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setCardNo(recordVo.getCardNo()); + patientsQuery.setYn(1); + patientsQuery.setHospitalId("2100002419"); + patientsQuery.setDesc("true"); + patientsQuery.setSort("created"); + List patientsList = patientsService.queryPatient(patientsQuery); + if(CollectionUtils.isNotEmpty(patientsList)){ + Patients patients = patientsList.get(0); + quanChanResult.setbTime(DateUtil.getYyyyMmDd(patients.getBookbuildingDate())); + quanChanResult.setPhone(patients.getPhone()); + quanChanResult.setId(patients.getId()); + quanChanResult.setPid(patients.getPid()); + Users serviceUsers = usersService.getUsers(patients.getOperator()); + if(serviceUsers != null){ + quanChanResult.setlName(serviceUsers.getName()); } - QuanChanResult quanChanResult = new QuanChanResult(); - quanChanResult.setName(recordVo.getName()); - String age1 = recordVo.getAge().substring(0,8); - Date date = DateUtil.parseYYYYMMDD(age1); - int age = DateUtil.getYearSpace(new Date(),date); - quanChanResult.setAge(age); - quanChanResult.setDueWeek(recordVo.getDeliveryTime()); - Date date2 = DateUtil.parseYMD(recordVo.getDeliveryTime()); - int day= DateUtil.getDays(date2,new Date()); - quanChanResult.setcTime(String.valueOf(day)); - quanChanResult.setRealPhone(recordVo.getPhone()); - data.add(quanChanResult); } + data.add(quanChanResult); } - com.lyms.platform.common.base.PageInfo pageInfo = new PageInfo(); - pageInfo.setCount(medicalRecordVo.getCount()); - pageInfo.setPage(medicalRecordVo.getPage()); - pageInfo.setLimit(medicalRecordVo.getLimit()); - pageInfo.setLastPage(medicalRecordVo.getLastPage()); - return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(pageInfo); - } - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, loginState.getId(), "true", Boolean.FALSE); + com.lyms.platform.common.base.PageInfo pageInfo = new PageInfo(); + pageInfo.setCount(medicalRecordVo.getCount()); + pageInfo.setPage(medicalRecordVo.getPage()); + pageInfo.setLimit(medicalRecordVo.getLimit()); + pageInfo.setLastPage(medicalRecordVo.getLastPage()); + return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(pageInfo); +// return patientFacade.queryHighRisk(patientsQueryRequest, null, 3, loginState.getId(), "true", Boolean.FALSE); } -- 1.8.3.1