From e808185b193cb90218d39c033d4c3e223be24531 Mon Sep 17 00:00:00 2001 From: LiJianZhao Date: Thu, 24 Apr 2025 12:11:10 +0800 Subject: [PATCH] dev --- .../diagnosis/MedicalRecordController.java | 13 +++++++---- .../diagnosis/dto/ChargeQueueQuery.java | 3 +++ .../mapper/diagnosis/DiagnosisMapper.java | 4 ++++ .../diagnosis/MedicalRecordService.java | 23 +++++++++++++++++++ .../clinic/server/ServerApplicationTests.java | 3 +++ 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/MedicalRecordController.java b/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/MedicalRecordController.java index 5227f27..041596f 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/MedicalRecordController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/MedicalRecordController.java @@ -1,7 +1,9 @@ package com.syjiaer.clinic.server.controller.diagnosis; +import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.common.vo.Result; import com.syjiaer.clinic.server.controller.BaseController; +import com.syjiaer.clinic.server.entity.diagnosis.dto.ChargeQueueQuery; import com.syjiaer.clinic.server.entity.diagnosis.dto.MedicalRecordSaveDto; import com.syjiaer.clinic.server.entity.diagnosis.vo.MedicalRecordVo; import com.syjiaer.clinic.server.service.diagnosis.MedicalRecordService; @@ -51,9 +53,10 @@ public class MedicalRecordController extends BaseController { /** * 获取收费队列 */ -// @RequestMapping("/getChargeQueue") -// public Result getChargeQueue() { -// -// -// } + @RequestMapping("/getChargeQueue") + public Result> getChargeQueue() { + ChargeQueueQuery query = parmsUtil.getObject("query", ChargeQueueQuery.class); + + return success( medicalRecordService.getChargeQueue(query)); + } } diff --git a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ChargeQueueQuery.java b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ChargeQueueQuery.java index 34c3728..bb149be 100644 --- a/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ChargeQueueQuery.java +++ b/src/main/java/com/syjiaer/clinic/server/entity/diagnosis/dto/ChargeQueueQuery.java @@ -1,5 +1,8 @@ package com.syjiaer.clinic.server.entity.diagnosis.dto; +import lombok.Data; + +@Data public class ChargeQueueQuery { private String patientName; private Integer pageNum; diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java index a563d28..463dfd9 100644 --- a/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java +++ b/src/main/java/com/syjiaer/clinic/server/mapper/diagnosis/DiagnosisMapper.java @@ -16,5 +16,9 @@ import org.apache.ibatis.annotations.Select; public interface DiagnosisMapper extends BaseMapper { @Select("select * from diagnosis where code = #{code}") Diagnosis selectByCode(String code); + @Select("SELECT diagnosis.*,patient_info.name FROM diagnosis " + + "LEFT JOIN patient_info on " + + "diagnosis.patient_id = patient_info.\"id\" WHERE patient_info.name =#{patientName}") + void selectByPatientName(String patientName); } diff --git a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java index 045156e..f1ef1ca 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/MedicalRecordService.java @@ -9,7 +9,9 @@ import com.syjiaer.clinic.server.common.config.Config; import com.syjiaer.clinic.server.common.enums.RegistrationStatusEnum; import com.syjiaer.clinic.server.common.exception.MessageException; import com.syjiaer.clinic.server.common.util.StringUtil; +import com.syjiaer.clinic.server.common.vo.Page; import com.syjiaer.clinic.server.entity.diagnosis.Diagnosis; +import com.syjiaer.clinic.server.entity.diagnosis.dto.ChargeQueueQuery; import com.syjiaer.clinic.server.entity.goods.Goods; import com.syjiaer.clinic.server.entity.item.Item; import com.syjiaer.clinic.server.entity.manager.ManagerUser; @@ -261,4 +263,25 @@ public class MedicalRecordService extends BaseService { } + /* + 获取收费队列 + */ + public Page getChargeQueue(ChargeQueueQuery query) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + Page diagnosisList =pageHelper(query.getPageNum(), query.getPageSize(),queryWrapper,diagnosisMapper,"create_time", false); + + List list = new ArrayList<>(); + for (Diagnosis diagnosis : diagnosisList.getList()){ + MedicalRecordVo vo = new MedicalRecordVo(); + vo = getDetailByRegisId(diagnosis.getRegistrationId()); + list.add(vo); + } + + Page page = new Page<>(); + page.setList(list); + page.setTotal_page(diagnosisList.getTotal_page()); + page.setTotal_count(diagnosisList.getTotal_count()); + return page; + } } diff --git a/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java b/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java index 1b1848f..bf05e5f 100644 --- a/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java +++ b/src/test/java/com/syjiaer/clinic/server/ServerApplicationTests.java @@ -1,5 +1,6 @@ package com.syjiaer.clinic.server; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.syjiaer.clinic.server.service.diagnosis.MedicalRecordService; import com.syjiaer.clinic.server.service.social.SocialDiagnoseService; import org.junit.jupiter.api.Test; @@ -16,6 +17,8 @@ class ServerApplicationTests { @Test void contextLoads() { // medicalRecordService.uploadDiagnosis("ZD20250424105340459612"); + + socialDiagnoseService.download("0"); }