org启用flag

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[] {"停用"}));
     }
 
     /**

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;