From 63b6ab796c4798a9a6c2ef251d5818ce67a71288 Mon Sep 17 00:00:00 2001
From: anxin <anxin@ccbjb.com.cn>
Date: Wed, 26 Feb 2025 18:32:05 +0800
Subject: [PATCH] =?UTF-8?q?org=E5=90=AF=E7=94=A8flag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OrganizationController.java    | 31 ++++++++++++++-----
 .../dto/OrganizationInitDto.java              |  1 -
 .../service/IOrganizationService.java         |  2 +-
 .../service/impl/OrganizationServiceImpl.java | 25 +++++++++------
 4 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
index 03be157b..aef00d0c 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
@@ -171,18 +171,33 @@ public class OrganizationController {
     }
 
     /**
-     * 停用启用
+     * 启用
      *
-     * @param orgId 主表id
+     * @param orgId 启用数据的Id
      */
-    @PutMapping("/organization-flag")
-    public R<?> changeOrgFlag(@RequestParam Long orgId) {
+    @PutMapping("/organization-active")
+    public R<?> changeActive(@RequestParam Long orgId) {
 
-        boolean flagChangeSuccess = organizationService.changeOrgFlag(orgId);
+        boolean activeSuccess = organizationService.activeChange(orgId);
 
-        return flagChangeSuccess
-            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"机构活动标识"}))
-            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"机构活动标识"}));
+        return activeSuccess
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"启用"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"启用"}));
+    }
+
+    /**
+     * 停用
+     *
+     * @param orgId 停用数据的Id
+     */
+    @PutMapping("/organization-inactive")
+    public R<?> changeInactive(@RequestParam Long orgId) {
+
+        boolean inActiveSuccess = organizationService.activeChange(orgId);
+
+        return inActiveSuccess
+            ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[] {"停用"}))
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"停用"}));
     }
 
     /**
diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java
index f10e0461..7e231f39 100644
--- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java
+++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/dto/OrganizationInitDto.java
@@ -3,7 +3,6 @@
  */
 package com.openhis.web.basedatamanage.dto;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
index f7bb65b3..a211a5d7 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
@@ -10,5 +10,5 @@ import com.openhis.administration.domain.Organization;
  * @date 2025-02-21
  */
 public interface IOrganizationService extends IService<Organization> {
-    boolean changeOrgFlag(Long orgId);
+    boolean activeChange(Long orgId);
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
index 6ee12138..340567ed 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
@@ -23,20 +23,25 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
     private OrganizationMapper organizationMapper;
 
     @Override
-    public boolean changeOrgFlag(Long orgId) {
-
+    public boolean activeChange(Long orgId) {
         if (orgId != null) {
             Organization organization = organizationMapper.selectById(orgId);
-            if (organization.getActiveFlag().equals(AccountStatus.ACTIVE.getValue())) {
-                organization.setActiveFlag(AccountStatus.INACTIVE.getValue());
-                return true;
-            } else {
-                organization.setActiveFlag(AccountStatus.ACTIVE.getValue());
+            if (organization != null) {
+                Integer activeFlag  = organization.getActiveFlag();
+                switch (activeFlag ) {
+                    case 1:
+                        organization.setActiveFlag(AccountStatus.INACTIVE.getValue());
+                        break;
+                    case 2:
+                        organization.setActiveFlag(AccountStatus.ACTIVE.getValue());
+                        break;
+                    default:
+                        return false;
+                }
+                organizationMapper.updateById(organization);
                 return true;
             }
-        } else {
-            return false;
         }
+        return false;
     }
-
 }
\ No newline at end of file