From 5ef05b9b55b247f867c8b90f8b88dc480967f9b8 Mon Sep 17 00:00:00 2001 From: chenqi Date: Wed, 17 Jun 2026 12:02:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(blood-transfusion):=20=E4=BF=AE=E5=A4=8DP0/?= =?UTF-8?q?P1=E9=97=AE=E9=A2=98=20-=20=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84?= =?UTF-8?q?/=E5=8F=82=E6=95=B0=E6=B8=85=E7=90=86/tenant=5Fid/Flyway?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/IBloodTransfusionAppService.java | 4 ++-- .../impl/BloodTransfusionAppServiceImpl.java | 10 +++------- .../controller/BloodTransfusionController.java | 10 ++++------ ...lood_transfusion.sql => V57__blood_transfusion.sql} | 2 ++ 4 files changed, 11 insertions(+), 15 deletions(-) rename healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/{V2026_0618__blood_transfusion.sql => V57__blood_transfusion.sql} (95%) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/appservice/IBloodTransfusionAppService.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/appservice/IBloodTransfusionAppService.java index 7595d664d..3ae63cf6c 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/appservice/IBloodTransfusionAppService.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/appservice/IBloodTransfusionAppService.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.Map; public interface IBloodTransfusionAppService { void apply(BloodTransfusionRecord record); - IPage page(String patientName, String approvalStatus, String bloodComponent, Integer pageNum, Integer pageSize); - void approve(Long id, String approvalStatus, String approverName, String remark); + IPage page(String approvalStatus, String bloodComponent, Integer pageNum, Integer pageSize); + void approve(Long id, String approvalStatus, String approverName); void observe(BloodTransfusionObservation observation); Map getRecordDetail(Long id); } diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/appservice/impl/BloodTransfusionAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/appservice/impl/BloodTransfusionAppServiceImpl.java index 108667ef9..c355decce 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/appservice/impl/BloodTransfusionAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/appservice/impl/BloodTransfusionAppServiceImpl.java @@ -23,11 +23,8 @@ public class BloodTransfusionAppServiceImpl implements IBloodTransfusionAppServi recordService.save(record); } @Override - public IPage page(String patientName, String approvalStatus, String bloodComponent, Integer pageNum, Integer pageSize) { + public IPage page(String approvalStatus, String bloodComponent, Integer pageNum, Integer pageSize) { LambdaQueryWrapper w = new LambdaQueryWrapper<>(); - if (patientName != null && !patientName.isEmpty()) { - w.like(BloodTransfusionRecord::getDoctorName, patientName); - } if (approvalStatus != null && !approvalStatus.isEmpty()) { w.eq(BloodTransfusionRecord::getApprovalStatus, approvalStatus); } @@ -38,7 +35,7 @@ public class BloodTransfusionAppServiceImpl implements IBloodTransfusionAppServi return recordService.page(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageNum, pageSize), w); } @Override - public void approve(Long id, String approvalStatus, String approverName, String remark) { + public void approve(Long id, String approvalStatus, String approverName) { BloodTransfusionRecord record = recordService.getById(id); if (record == null) { throw new RuntimeException("输血记录不存在"); @@ -63,8 +60,7 @@ public class BloodTransfusionAppServiceImpl implements IBloodTransfusionAppServi Map result = new LinkedHashMap<>(); BloodTransfusionRecord record = recordService.getById(id); if (record == null) { - result.put("error", "记录不存在"); - return result; + throw new RuntimeException("输血记录不存在"); } result.put("record", record); List observations = observationService.list( diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/controller/BloodTransfusionController.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/controller/BloodTransfusionController.java index 4a9352b42..515b48973 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/controller/BloodTransfusionController.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/bloodtransfusion/controller/BloodTransfusionController.java @@ -22,21 +22,19 @@ public class BloodTransfusionController { @Operation(summary = "输血申请分页") @PreAuthorize("@ss.hasPermi('inpatient:bloodtransfusion:list')") @GetMapping("/page") - public AjaxResult page(@RequestParam(required = false) String patientName, - @RequestParam(required = false) String approvalStatus, + public AjaxResult page(@RequestParam(required = false) String approvalStatus, @RequestParam(required = false) String bloodComponent, @RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize) { - return AjaxResult.success(appService.page(patientName, approvalStatus, bloodComponent, pageNum, pageSize)); + return AjaxResult.success(appService.page(approvalStatus, bloodComponent, pageNum, pageSize)); } @Operation(summary = "审批输血") @PreAuthorize("@ss.hasPermi('inpatient:bloodtransfusion:edit')") @PutMapping("/approve/{id}") public AjaxResult approve(@PathVariable Long id, @RequestParam String approvalStatus, - @RequestParam(required = false) String approverName, - @RequestParam(required = false) String remark) { - appService.approve(id, approvalStatus, approverName, remark); + @RequestParam(required = false) String approverName) { + appService.approve(id, approvalStatus, approverName); return AjaxResult.success(); } @Operation(summary = "输血观察记录") diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V2026_0618__blood_transfusion.sql b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V57__blood_transfusion.sql similarity index 95% rename from healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V2026_0618__blood_transfusion.sql rename to healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V57__blood_transfusion.sql index 9fbf67378..9cd3f06d9 100644 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V2026_0618__blood_transfusion.sql +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/db/migration/V57__blood_transfusion.sql @@ -25,6 +25,7 @@ CREATE TABLE blood_transfusion_record ( adverse_reaction TEXT, adverse_reaction_type VARCHAR(50), status VARCHAR(20) DEFAULT 'DRAFT', + tenant_id INTEGER DEFAULT 0, del_flag CHAR(1) DEFAULT '0', create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, create_by VARCHAR(64), @@ -45,6 +46,7 @@ CREATE TABLE blood_transfusion_observation ( symptoms TEXT, nurse_id BIGINT, nurse_name VARCHAR(50), + tenant_id INTEGER DEFAULT 0, del_flag CHAR(1) DEFAULT '0', create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, create_by VARCHAR(64)