From 6ff77c31c5a578309b55cb3d1257c98e8a931562 Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Tue, 4 Mar 2025 16:25:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HealthcareServiceController.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java index c4d01cd4..3c7f1f14 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java @@ -28,6 +28,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -139,17 +140,23 @@ public class HealthcareServiceController { /** * 服务管理 删除 * - * @param id ID + * @param ids ID * @return 删除结果 */ @DeleteMapping(value = "/healthcare-service") - public R delete(@RequestParam Long id) { - boolean res = iHealthcareServiceService.removeById(id); + public R delete(@RequestParam String ids) { + List idsList = new ArrayList<>(); + if (ids != null) { + idsList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList()); + } + boolean res = iHealthcareServiceService.removeByIds(idsList); // 同时删除非同定价 - LambdaQueryWrapper QueryWrapper = new LambdaQueryWrapper<>(); - QueryWrapper.eq(ChargeItemDefinition::getInstanceId, id). - eq(ChargeItemDefinition::getInstanceTable, CommonConstants.TableName.ADM_HEALTHCARE_SERVICE); - iChargeItemDefinitionService.remove(QueryWrapper); + for (Long id : idsList) { + LambdaQueryWrapper QueryWrapper = new LambdaQueryWrapper<>(); + QueryWrapper.eq(ChargeItemDefinition::getInstanceId, id). + eq(ChargeItemDefinition::getInstanceTable, CommonConstants.TableName.ADM_HEALTHCARE_SERVICE); + iChargeItemDefinitionService.remove(QueryWrapper); + } return res ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[]{"服务管理"})) : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00006, null)); }