From e44ccb2e079cf438c921f82dfe8e623e1d5fa938 Mon Sep 17 00:00:00 2001
From: anxin <anxin@ccbjb.com.cn>
Date: Tue, 25 Feb 2025 09:21:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84org=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OrganizationController.java     | 18 +++++++++---------
 .../service/impl/OrganizationServiceImpl.java  |  2 +-
 2 files changed, 10 insertions(+), 10 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 5b9a8c25..eb0e723b 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
@@ -54,11 +54,11 @@ public class OrganizationController {
         String code = assignSeqUtil.getSeq(AssignSeqEnum.TEST.getPrefix());
         organization.setBus_no(code);
 
-        boolean saveOrganizationSuccess = organizationService.save(organization);
+        boolean saveOrgSuccess = organizationService.save(organization);
 
-        return saveOrganizationSuccess
+        return saveOrgSuccess
             ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"科室信息"}))
-            : R.fail(PromptMsgConstant.Common.M00007, null);
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00003, new Object[] {"科室信息"}));
     }
 
     /**
@@ -72,10 +72,10 @@ public class OrganizationController {
         // Organization organization = new Organization();
         // BeanUtils.copyProperties(organizationdto, organization);
 
-        boolean updateSuccess = organizationService.updateById(organization);
-        return updateSuccess
+        boolean updateOrgSuccess = organizationService.updateById(organization);
+        return updateOrgSuccess
             ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"科室信息"}))
-            : R.fail(PromptMsgConstant.Common.M00007, null);
+            : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"科室信息"}));
     }
 
     /**
@@ -86,9 +86,9 @@ public class OrganizationController {
     @DeleteMapping("/organization")
     public R<?> deleteSupplyRequest(@RequestParam Long orgId) {
 
-        boolean deleteSuccess = organizationService.removeById(orgId);
+        boolean deleteOrgSuccess = organizationService.removeById(orgId);
 
-        return deleteSuccess
+        return deleteOrgSuccess
             ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00005, new Object[] {"科室信息"}))
             : R.fail(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00006, new Object[] {"科室信息删除失败"}));
     }
@@ -111,7 +111,7 @@ public class OrganizationController {
         // 查询【科室】分页列表
         Page<Organization> organizationPage =
             organizationService.getOrganizationPage(classEnum, activeFlag, pageNo, pageSize);
-        return R.ok(organizationPage);
+        return R.ok(organizationPage, MessageUtils.createMessage(PromptMsgConstant.Common.M00007, new Object[] {"科室信息"}));
     }
 
 }
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 c60b593c..4689cbf1 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
@@ -42,7 +42,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
         }
 
         if (activeFlag != null) {
-            queryWrapper.eq(Organization::getTypeEnum, activeFlag);
+            queryWrapper.eq(Organization::getActiveFlag, activeFlag);
         }
 
         Page<Organization> organizationPage = organizationMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper);