From f90c7ec4cad4e3c346625b9dcfaf55f250ec9ce3 Mon Sep 17 00:00:00 2001
From: "Wang.Huan" <wanghuan@ccbjb.com.cn>
Date: Fri, 28 Feb 2025 18:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HealthcareServiceController.java          | 36 +++++++++++++++++++
 .../service/IHealthcareServiceService.java    |  7 ++++
 .../impl/HealthcareServiceServiceImpl.java    | 22 ++++++++++--
 3 files changed, 62 insertions(+), 3 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 47749781..af451290 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
@@ -3,6 +3,7 @@
  */
 package com.openhis.web.basicservice.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -109,4 +110,39 @@ public class HealthcareServiceController {
     }
 
 
+    /**
+     * 服务管理 编辑
+     *
+     * @param healthcareServiceAddOrUpdateParam 表单数据
+     * @return 编辑结果
+     */
+    @PutMapping(value = "/healthcare-service")
+    public R<?> edit(@Validated @RequestBody HealthcareServiceAddOrUpdateParam healthcareServiceAddOrUpdateParam) {
+        // 服务管理-表单数据
+        HealthcareService healthcareServiceFormData = healthcareServiceAddOrUpdateParam.getHealthcareServiceFormData();
+        boolean res = iHealthcareServiceService.updateHealthcareService(healthcareServiceFormData);
+        return res ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[]{"服务管理"})) :
+                R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null));
+    }
+
+    /**
+     * 服务管理 删除
+     *
+     * @param id ID
+     * @return 删除结果
+     */
+    @DeleteMapping(value = "/healthcare-service")
+    @Transactional(rollbackFor = Exception.class)
+    public R<?> delete(@RequestParam Long id) {
+        boolean res = iHealthcareServiceService.removeById(id);
+        // 同时删除非同定价
+        LambdaQueryWrapper<ChargeItemDefinition> 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));
+    }
+
+
 }
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java
index cecb9114..42a29755 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IHealthcareServiceService.java
@@ -18,4 +18,11 @@ public interface IHealthcareServiceService extends IService<HealthcareService> {
      */
     HealthcareService addHealthcareService(HealthcareService healthcareService);
 
+    /**
+     * 服务管理 编辑
+     * @param healthcareService 表单信息
+     * @return 编辑结果
+     */
+    boolean updateHealthcareService(HealthcareService healthcareService);
+
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java
index cb47ce1c..73f49d45 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/HealthcareServiceServiceImpl.java
@@ -1,11 +1,10 @@
 package com.openhis.administration.service.impl;
 
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.administration.domain.HealthcareService;
 import com.openhis.administration.mapper.HealthcareServiceMapper;
 import com.openhis.administration.service.IHealthcareServiceService;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -20,14 +19,31 @@ public class HealthcareServiceServiceImpl extends ServiceImpl<HealthcareServiceM
 
     /**
      * 服务管理 新增
+     *
      * @param healthcareService 表单信息
      * @return 入库后信息
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HealthcareService addHealthcareService(HealthcareService healthcareService){
+    public HealthcareService addHealthcareService(HealthcareService healthcareService) {
         baseMapper.insert(healthcareService);
         return healthcareService;
     }
 
+    /**
+     * 服务管理 编辑
+     *
+     * @param healthcareService 表单信息
+     * @return 编辑结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateHealthcareService(HealthcareService healthcareService) {
+        if (healthcareService.getId() == null) {
+            return false;
+        } else {
+            return baseMapper.updateById(healthcareService) > 0;
+        }
+    }
+
 }
\ No newline at end of file